diff --git a/src/components/services-list.js b/src/components/services-list.js
index 795da0872e..5c913a0e48 100644
--- a/src/components/services-list.js
+++ b/src/components/services-list.js
@@ -19,11 +19,19 @@ export default new Polymer({
   },
 
   computeDomains(serviceDomains) {
-    return serviceDomains.valueSeq().map((domain) => domain.domain).sort().toJS();
+    return serviceDomains
+      .valueSeq()
+      .map((domain) => domain.domain)
+      .sort()
+      .toJS();
   },
 
   computeServices(serviceDomains, domain) {
-    return serviceDomains.get(domain).get('services').keySeq().toArray();
+    return serviceDomains
+      .get(domain)
+      .get('services')
+      .keySeq()
+      .toArray();
   },
 
   serviceClicked(ev) {
diff --git a/src/layouts/partial-dev-call-service.js b/src/layouts/partial-dev-call-service.js
index f5c7c32ec8..cf894c12d1 100644
--- a/src/layouts/partial-dev-call-service.js
+++ b/src/layouts/partial-dev-call-service.js
@@ -45,9 +45,18 @@ export default new Polymer({
   computeDescription(hass, domain, service) {
     return hass.reactor.evaluate([
       hass.serviceGetters.entityMap,
-      map => (map.has(domain) && map.get(domain).get('services').has(service) ?
-              JSON.stringify(map.get(domain).get('services').get(service).toJS(), null, 2) :
-              'No description available'),
+      map => {
+        if (map.has(domain) && map.get(domain).get('services').has(service)) {
+          return JSON.stringify(
+            map
+              .get(domain)
+              .get('services')
+              .get(service)
+              .toJS(),
+            null, 2);
+        }
+        return 'No description available';
+      },
     ]);
   },