diff --git a/hassio/addons/__init__.py b/hassio/addons/__init__.py
index cc68829ab..f3e674da2 100644
--- a/hassio/addons/__init__.py
+++ b/hassio/addons/__init__.py
@@ -90,7 +90,7 @@ class AddonManager(AddonsData):
 
         # remove stalled addons
         for addon in self.list_removed:
-        _LOGGER.warning("Dedicated addon '%s' found!", addon)
+            _LOGGER.warning("Dedicated addon '%s' found!", addon)
 
     async def auto_boot(self, start_type):
         """Boot addons with mode auto."""
diff --git a/hassio/addons/git.py b/hassio/addons/git.py
index 8195d42fa..5088787a5 100644
--- a/hassio/addons/git.py
+++ b/hassio/addons/git.py
@@ -74,7 +74,7 @@ class AddonsRepo(object):
             return True
 
 
-class AddonsRepoHassIO(AddonsRepo)
+class AddonsRepoHassIO(AddonsRepo):
     """HassIO addons repository."""
 
     def __init__(self, config, loop):
diff --git a/hassio/config.py b/hassio/config.py
index 4848fe5e0..5980530d2 100644
--- a/hassio/config.py
+++ b/hassio/config.py
@@ -33,7 +33,8 @@ API_ENDPOINT = 'api_endpoint'
 
 SCHEMA_CONFIG = vol.Schema({
     vol.Optional(
-        HOMEASSISTANT_IMAGE default=os.environ['HOMEASSISTANT_REPOSITORY']):
+        HOMEASSISTANT_IMAGE,
+        default=os.environ.get('HOMEASSISTANT_REPOSITORY'):
             vol.Coerce(str),
     vol.Optional(UPSTREAM_BETA, default=False): vol.Boolean(),
     vol.Optional(API_ENDPOINT): vol.Coerce(str),