diff --git a/homeassistant/components/camera/__init__.py b/homeassistant/components/camera/__init__.py
index ae5fe28beac..e63665230ca 100644
--- a/homeassistant/components/camera/__init__.py
+++ b/homeassistant/components/camera/__init__.py
@@ -19,6 +19,7 @@ from homeassistant.const import (
     )
 
 from homeassistant.helpers.entity_component import EntityComponent
+import homeassistant.util.dt as dt_util
 
 
 DOMAIN = 'camera'
@@ -80,19 +81,21 @@ def setup(hass, config):
     def _proxy_camera_image(handler, path_match, data):
         """ Proxies the camera image via the HA server. """
         entity_id = path_match.group(ATTR_ENTITY_ID)
+        camera = component.entities.get(entity_id)
 
-        camera = None
-        if entity_id in component.entities.keys():
-            camera = component.entities[entity_id]
-
-        if camera:
-            response = camera.camera_image()
-            if response is not None:
-                handler.wfile.write(response)
-            else:
-                handler.send_response(HTTP_NOT_FOUND)
-        else:
+        if camera is None:
             handler.send_response(HTTP_NOT_FOUND)
+            handler.end_headers()
+            return
+
+        response = camera.camera_image()
+
+        if response is None:
+            handler.send_response(HTTP_NOT_FOUND)
+            handler.end_headers()
+            return
+
+        handler.wfile.write(response)
 
     hass.http.register_path(
         'GET',
@@ -108,12 +111,9 @@ def setup(hass, config):
         stream even with only a still image URL available.
         """
         entity_id = path_match.group(ATTR_ENTITY_ID)
+        camera = component.entities.get(entity_id)
 
-        camera = None
-        if entity_id in component.entities.keys():
-            camera = component.entities[entity_id]
-
-        if not camera:
+        if camera is None:
             handler.send_response(HTTP_NOT_FOUND)
             handler.end_headers()
             return
@@ -131,7 +131,6 @@ def setup(hass, config):
             # MJPEG_START_HEADER.format()
 
             while True:
-
                 img_bytes = camera.camera_image()
                 if img_bytes is None:
                     continue
@@ -148,12 +147,12 @@ def setup(hass, config):
                 handler.request.sendall(
                     bytes('--jpgboundary\r\n', 'utf-8'))
 
+                time.sleep(0.5)
+
         except (requests.RequestException, IOError):
             camera.is_streaming = False
             camera.update_ha_state()
 
-        camera.is_streaming = False
-
     hass.http.register_path(
         'GET',
         re.compile(
diff --git a/homeassistant/components/camera/demo.py b/homeassistant/components/camera/demo.py
index fc3ec263143..fd79bc3ce82 100644
--- a/homeassistant/components/camera/demo.py
+++ b/homeassistant/components/camera/demo.py
@@ -24,12 +24,10 @@ class DemoCamera(Camera):
 
     def camera_image(self):
         """ Return a faked still image response. """
-
         image_path = os.path.join(os.path.dirname(__file__),
                                   'demo_{}.png'.format(randint(1, 5)))
         with open(image_path, 'rb') as file:
-            output = file.read()
-        return output
+            return file.read()
 
     @property
     def name(self):