diff --git a/cmd/micro/messenger.go b/cmd/micro/messenger.go
index 0d20603a..b38c3a1d 100644
--- a/cmd/micro/messenger.go
+++ b/cmd/micro/messenger.go
@@ -504,7 +504,11 @@ func (m *Messenger) LoadHistory() {
 			}
 		}
 
-		m.history = decodedMap
+		if decodedMap != nil {
+			m.history = decodedMap
+		} else {
+			m.history = make(map[string][]string)
+		}
 	} else {
 		m.history = make(map[string][]string)
 	}
diff --git a/cmd/micro/settings.go b/cmd/micro/settings.go
index 02f61313..f35a3beb 100644
--- a/cmd/micro/settings.go
+++ b/cmd/micro/settings.go
@@ -326,10 +326,12 @@ func SetOption(option, value string) error {
 		}
 	}
 
-	if _, ok := CurView().Buf.Settings[option]; ok {
-		for _, tab := range tabs {
-			for _, view := range tab.views {
-				SetLocalOption(option, value, view)
+	if len(tabs) != 0 {
+		if _, ok := CurView().Buf.Settings[option]; ok {
+			for _, tab := range tabs {
+				for _, view := range tab.views {
+					SetLocalOption(option, value, view)
+				}
 			}
 		}
 	}