From 3b693d5e70a8202aa2a4d9f86fa027e01134258a Mon Sep 17 00:00:00 2001
From: Erik Eriksson <molobrakos@users.noreply.github.com>
Date: Wed, 22 Feb 2017 16:43:52 +0100
Subject: [PATCH] generic camera: improved exception handling (#6158)

Avoid unhandled exception and stack trace when server closes connection by changing from handle ClientDisconnectedError to DisconnectedError. Also added HttpProcessingError, which was missing.
---
 homeassistant/components/camera/generic.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/camera/generic.py b/homeassistant/components/camera/generic.py
index f16c96c0b12..f9a4e8c2f06 100644
--- a/homeassistant/components/camera/generic.py
+++ b/homeassistant/components/camera/generic.py
@@ -118,7 +118,8 @@ class GenericCamera(Camera):
                 _LOGGER.error('Timeout getting camera image')
                 return self._last_image
             except (aiohttp.errors.ClientError,
-                    aiohttp.errors.ClientDisconnectedError) as err:
+                    aiohttp.errors.DisconnectedError,
+                    aiohttp.errors.HttpProcessingError) as err:
                 _LOGGER.error('Error getting new camera image: %s', err)
                 return self._last_image
             finally: