add exception handling to generic camera requests function.

homeassistant/components/camera/__init__.py

@@ -87,7 +87,10 @@ def setup(hass, config):
 
         if camera:
             response = camera.camera_image()
-            handler.wfile.write(response)
+            if response is not None:
+                handler.wfile.write(response)
+            else:
+                handler.send_response(HTTP_NOT_FOUND)
         else:
             handler.send_response(HTTP_NOT_FOUND)
 
@@ -129,20 +132,21 @@ def setup(hass, config):
             while True:
 
                 img_bytes = camera.camera_image()
+                if img_bytes is not None:
+                    headers_str = '\r\n'.join((
+                        'Content-length: {}'.format(len(img_bytes)),
+                        'Content-type: image/jpeg',
+                    )) + '\r\n\r\n'
 
-                headers_str = '\r\n'.join((
+                    handler.request.sendall(
-                    'Content-length: {}'.format(len(img_bytes)),
+                        bytes(headers_str, 'utf-8') +
-                    'Content-type: image/jpeg',
+                        img_bytes +
-                )) + '\r\n\r\n'
+                        bytes('\r\n', 'utf-8'))
-
-                handler.request.sendall(
-                    bytes(headers_str, 'utf-8') +
-                    img_bytes +
-                    bytes('\r\n', 'utf-8'))
-
-                handler.request.sendall(
-                    bytes('--jpgboundary\r\n', 'utf-8'))
 
+                    handler.request.sendall(
+                        bytes('--jpgboundary\r\n', 'utf-8'))
+                else:
+                    break
         except (requests.RequestException, IOError):
             camera.is_streaming = False
             camera.update_ha_state()

homeassistant/components/camera/generic.py

@@ -42,11 +42,19 @@ class GenericCamera(Camera):
     def camera_image(self):
         """ Return a still image reponse from the camera. """
         if self._username and self._password:
-            response = requests.get(
+            try:
-                self._still_image_url,
+                response = requests.get(
-                auth=HTTPBasicAuth(self._username, self._password))
+                    self._still_image_url,
+                    auth=HTTPBasicAuth(self._username, self._password))
+            except requests.exceptions.RequestException as error:
+                _LOGGER.error('Error getting camera image: %s', error)
+                return None
         else:
-            response = requests.get(self._still_image_url)
+            try:
+                response = requests.get(self._still_image_url)
+            except requests.exceptions.RequestException as error:
+                _LOGGER.error('Error getting camera image: %s', error)
+                return None
 
         return response.content