diff --git a/homeassistant/components/calendar/google.py b/homeassistant/components/calendar/google.py
index 098c7c70834..a8763e8ca9e 100644
--- a/homeassistant/components/calendar/google.py
+++ b/homeassistant/components/calendar/google.py
@@ -62,7 +62,14 @@ class GoogleCalendarData(object):
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
     def update(self):
         """Get the latest data."""
-        service = self.calendar_service.get()
+        from httplib2 import ServerNotFoundError
+
+        try:
+            service = self.calendar_service.get()
+        except ServerNotFoundError:
+            _LOGGER.warning("Unable to connect to Google, using cached data")
+            return False
+
         params = dict(DEFAULT_GOOGLE_SEARCH_PARAMS)
         params['timeMin'] = dt.now().isoformat('T')
         params['calendarId'] = self.calendar_id
diff --git a/tests/components/calendar/test_google.py b/tests/components/calendar/test_google.py
index 62c8ea8854f..9f94ea9f44c 100644
--- a/tests/components/calendar/test_google.py
+++ b/tests/components/calendar/test_google.py
@@ -2,7 +2,7 @@
 # pylint: disable=protected-access
 import logging
 import unittest
-from unittest.mock import patch
+from unittest.mock import patch, Mock
 
 import pytest
 
@@ -11,7 +11,7 @@ import homeassistant.components.calendar.google as calendar
 import homeassistant.util.dt as dt_util
 from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON
 from homeassistant.helpers.template import DATE_STR_FORMAT
-from tests.common import get_test_home_assistant
+from tests.common import get_test_home_assistant, MockDependency
 
 TEST_PLATFORM = {calendar_base.DOMAIN: {CONF_PLATFORM: 'test'}}
 
@@ -421,3 +421,16 @@ class TestComponentsGoogleCalendar(unittest.TestCase):
             'location': event['location'],
             'description': event['description']
         })
+
+    @MockDependency("httplib2")
+    def test_update_false(self, mock_httplib2):
+        """Test that the update returns False upon Error."""
+        mock_service = Mock()
+        mock_service.get = Mock(
+            side_effect=mock_httplib2.ServerNotFoundError("unit test"))
+
+        cal = calendar.GoogleCalendarEventDevice(self.hass, mock_service, None,
+                                                 {'name': "test"})
+        result = cal.data.update()
+
+        self.assertFalse(result)