From 0af05d178b9ecaaeb10b9b7f13288fa1b3b72f3a Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Tue, 4 Oct 2016 22:15:41 +0200
Subject: [PATCH] add error handling

---
 homeassistant/core.py | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/homeassistant/core.py b/homeassistant/core.py
index e13c948627a..a4c27023818 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -167,15 +167,22 @@ class HomeAssistant(object):
         )
 
         # Setup signal handling
-        if sys.platform != "win32":
-            self.loop.add_signal_handler(
-                signal.SIGTERM,
-                stop_homeassistant
-            )
-            self.loop.add_signal_handler(
-                signal.SIGHUP,
-                restart_homeassistant
-            )
+        if sys.platform != 'win32':
+            try:
+                self.loop.add_signal_handler(
+                    signal.SIGTERM,
+                    stop_homeassistant
+                )
+            except ValueError:
+                _LOGGER.warning('Could not bind to SIGTERM.')
+
+            try:
+                self.loop.add_signal_handler(
+                    signal.SIGHUP,
+                    restart_homeassistant
+                )
+            except ValueError:
+                _LOGGER.warning('Could not bind to SIGHUP.')
 
         # Run forever and catch keyboard interrupt
         try: