diff --git a/homeassistant/components/camera/__init__.py b/homeassistant/components/camera/__init__.py
index 01c6c1b6e03..ff5198b7ab1 100644
--- a/homeassistant/components/camera/__init__.py
+++ b/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,7 +132,8 @@ def setup(hass, config):
             while True:
 
                 img_bytes = camera.camera_image()
-
+                if img_bytes is None:
+                    continue
                 headers_str = '\r\n'.join((
                     'Content-length: {}'.format(len(img_bytes)),
                     'Content-type: image/jpeg',
diff --git a/homeassistant/components/camera/generic.py b/homeassistant/components/camera/generic.py
index 55fa4ec913f..b8be51292bf 100644
--- a/homeassistant/components/camera/generic.py
+++ b/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(
-                self._still_image_url,
-                auth=HTTPBasicAuth(self._username, self._password))
+            try:
+                response = requests.get(
+                    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