diff --git a/source/HomeAssistantApp.mc b/source/HomeAssistantApp.mc
index 46338ee..0cc2b12 100644
--- a/source/HomeAssistantApp.mc
+++ b/source/HomeAssistantApp.mc
@@ -630,7 +630,10 @@ class HomeAssistantApp extends Application.AppBase {
                                 (item as HomeAssistantToggleMenuItem).updateToggleState(data[i.toString() + "t"]);
                             }
                             if (item instanceof HomeAssistantNumericMenuItem) {
-                                (item as HomeAssistantNumericMenuItem).updateNumericState(data[i.toString() + "n"].toString());
+                                if (data[i.toString() + "n"] != null)
+                                {
+                                    (item as HomeAssistantNumericMenuItem).updateNumericState(data[i.toString() + "n"].toString());
+                                }
                             }
                         }
                         if (Settings.getMenuCheck() && Settings.getCacheConfig() && !mIsCacheChecked) {
diff --git a/source/factory/HomeAssistantNumericFactory.mc b/source/factory/HomeAssistantNumericFactory.mc
index 62ad3d2..7c664f7 100644
--- a/source/factory/HomeAssistantNumericFactory.mc
+++ b/source/factory/HomeAssistantNumericFactory.mc
@@ -47,7 +47,7 @@ class HomeAssistantNumericFactory extends WatchUi.PickerFactory {
         if (mStep < 0.01) {
             mFormatString="%.3f";
         } else if (mStep < 0.1) {
-            mFormatString="%2f";
+            mFormatString="%.2f";
         } else if (mStep < 1) {
             mFormatString="%.1f";
         } else {