diff --git a/homeassistant/components/bond/__init__.py b/homeassistant/components/bond/__init__.py
index 199841673bfaf8..697023546ace4f 100644
--- a/homeassistant/components/bond/__init__.py
+++ b/homeassistant/components/bond/__init__.py
@@ -2,7 +2,6 @@
 import asyncio
 
 from bond import Bond
-import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_HOST
@@ -10,8 +9,6 @@
 
 from .const import DOMAIN
 
-CONFIG_SCHEMA = vol.Schema({DOMAIN: vol.Schema({})}, extra=vol.ALLOW_EXTRA)
-
 PLATFORMS = ["cover"]
 
 
diff --git a/homeassistant/components/bond/config_flow.py b/homeassistant/components/bond/config_flow.py
index 0ee633b79bb0ca..6adc135c9e7367 100644
--- a/homeassistant/components/bond/config_flow.py
+++ b/homeassistant/components/bond/config_flow.py
@@ -51,8 +51,6 @@ async def async_step_user(self, user_input=None):
         if user_input is not None:
             try:
                 info = await validate_input(self.hass, user_input)
-
-                return self.async_create_entry(title=info["title"], data=user_input)
             except CannotConnect:
                 errors["base"] = "cannot_connect"
             except InvalidAuth:
@@ -60,6 +58,8 @@ async def async_step_user(self, user_input=None):
             except Exception:  # pylint: disable=broad-except
                 _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
+            else:
+                return self.async_create_entry(title=info["title"], data=user_input)
 
         return self.async_show_form(
             step_id="user", data_schema=DATA_SCHEMA, errors=errors
diff --git a/homeassistant/components/bond/cover.py b/homeassistant/components/bond/cover.py
index 149ad8b9225075..e3bb30ad5d1d05 100644
--- a/homeassistant/components/bond/cover.py
+++ b/homeassistant/components/bond/cover.py
@@ -64,7 +64,7 @@ def name(self) -> Optional[str]:
     @property
     def device_info(self) -> Optional[Dict[str, Any]]:
         """Get a an HA device representing this cover."""
-        return {ATTR_NAME: self.name, "identifiers": {(DOMAIN, self.unique_id)}}
+        return {ATTR_NAME: self.name, "identifiers": {(DOMAIN, self._device.device_id)}}
 
     @property
     def is_closed(self):