diff --git a/alarmdecoder/devices/socket_device.py b/alarmdecoder/devices/socket_device.py
index 292c74e..9feced4 100644
--- a/alarmdecoder/devices/socket_device.py
+++ b/alarmdecoder/devices/socket_device.py
@@ -339,7 +339,7 @@ def timeout_event():
                             got_line = True
                             break
 
-        except socket.error as err:
+        except (socket.error, ValueError) as err:
             raise CommError('Error reading from device: {0}'.format(str(err)), err)
 
         except SSL.SysCallError as err: