diff --git a/cmd/main.go b/cmd/main.go
index 4494e280..b1889e2e 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -184,7 +184,7 @@ func createErrorDump(logFile *os.File) {
 
 	fmt.Printf("error dump created: %s\n", filePath)
 
-	ensureSymlink(filePath, filepath.Join(errorDumpDir, "last-crash.log"))
+	_ = ensureSymlink(filePath, filepath.Join(errorDumpDir, "last-crash.log"))
 }
 
 func doSupervise() {
diff --git a/display.go b/display.go
index 9ec4296f..bcee2256 100644
--- a/display.go
+++ b/display.go
@@ -27,6 +27,11 @@ const (
 )
 
 func switchToMainScreen() {
+	if networkManager == nil {
+		nativeInstance.SwitchToScreenIfDifferent("no_network_screen")
+		return
+	}
+
 	if networkManager.IsUp() {
 		nativeInstance.SwitchToScreenIfDifferent("home_screen")
 	} else {