diff --git a/lib/main.dart b/lib/main.dart
index 3f7fe7f..b83bf12 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -134,7 +134,7 @@ EventBus eventBus = new EventBus();
 final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
 FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = new FlutterLocalNotificationsPlugin();
 const String appName = "HA Client";
-const appVersionNumber = "0.6.7";
+const appVersionNumber = "0.6.8";
 const appVersionAdd = "alpha1";
 const appVersion = "$appVersionNumber-$appVersionAdd";
 
diff --git a/lib/view.class.dart b/lib/view.class.dart
index 1380767..173ea21 100644
--- a/lib/view.class.dart
+++ b/lib/view.class.dart
@@ -87,7 +87,7 @@ class HAView {
       } else {
         return
           Tab(
-              text: name.toUpperCase(),
+              text: "${name?.toUpperCase() ?? "UNNAMED VIEW"}",
           );
       }
     } else {
@@ -101,7 +101,7 @@ class HAView {
         );
       } else {
         return Tab(
-            text: linkedEntity.displayName.toUpperCase(),
+            text: "${linkedEntity.displayName?.toUpperCase()}",
         );
       }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 5f9d3d2..ab629c8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: hass_client
 description: Home Assistant Android Client
 
-version: 0.6.7+672
+version: 0.6.8+680
 
 environment:
   sdk: ">=2.0.0-dev.68.0 <3.0.0"