diff --git a/homeassistant/components/dsmr_reader/manifest.json b/homeassistant/components/dsmr_reader/manifest.json
index aa108d8bf9a..f1c52e02c83 100755
--- a/homeassistant/components/dsmr_reader/manifest.json
+++ b/homeassistant/components/dsmr_reader/manifest.json
@@ -1,7 +1,7 @@
 {
     "domain": "dsmr_reader",
     "name": "DSMR Reader",
-    "documentation": "https://www.home-assistant.io/components/dsmr_reader",
+    "documentation": "https://www.home-assistant.io/integrations/dsmr_reader",
     "requirements": [],
     "dependencies": [
         "mqtt"
diff --git a/homeassistant/components/dsmr_reader/sensor.py b/homeassistant/components/dsmr_reader/sensor.py
index c7efba9ddde..01c010c4971 100755
--- a/homeassistant/components/dsmr_reader/sensor.py
+++ b/homeassistant/components/dsmr_reader/sensor.py
@@ -1,6 +1,4 @@
 """Support for DSMR Reader through MQTT."""
-import logging
-
 from homeassistant.components import mqtt
 from homeassistant.core import callback
 from homeassistant.helpers.entity import Entity
@@ -8,8 +6,6 @@ from homeassistant.util import slugify
 
 from .definitions import DEFINITIONS
 
-_LOGGER = logging.getLogger(__name__)
-
 DOMAIN = "dsmr_reader"
 
 
@@ -34,15 +30,10 @@ class DSMRSensor(Entity):
         self._entity_id = slugify(topic.replace("/", "_"))
         self._topic = topic
 
-        self._name = self._definition["name"]
-        self._unit_of_measurement = (
-            self._definition["unit"] if "unit" in self._definition else ""
-        )
-        self._icon = self._definition["icon"] if "icon" in self._definition else None
-        self._transform = (
-            self._definition["transform"] if "transform" in self._definition else None
-        )
-
+        self._name = self._definition.get("name", topic.split("/")[-1])
+        self._unit_of_measurement = self._definition.get("unit")
+        self._icon = self._definition.get("icon")
+        self._transform = self._definition.get("transform")
         self._state = None
 
     async def async_added_to_hass(self):
@@ -59,7 +50,7 @@ class DSMRSensor(Entity):
 
             self.async_schedule_update_ha_state()
 
-        return await mqtt.async_subscribe(self.hass, self._topic, message_received, 1)
+        await mqtt.async_subscribe(self.hass, self._topic, message_received, 1)
 
     @property
     def name(self):