diff --git a/controller/fileStore.go b/controller/fileStore.go
index d8515604..d2661e10 100644
--- a/controller/fileStore.go
+++ b/controller/fileStore.go
@@ -62,6 +62,9 @@ func MakeFileStore(path string) *FileStore {
 				return nil
 			}
 			log.Printf("Created directory %v", path)
+		} else {
+			log.Printf("Unknown error initializing filestore: %v", err)
+			return nil
 		}
 	}
 
diff --git a/fission-bundle/main.go b/fission-bundle/main.go
index a8b60c86..cec0759e 100644
--- a/fission-bundle/main.go
+++ b/fission-bundle/main.go
@@ -14,6 +14,9 @@ import (
 func runController(port int, etcdUrl string, filepath string) {
 	// filePath will be created if it doesn't exist.
 	fileStore := controller.MakeFileStore(filepath)
+	if fileStore == nil {
+		log.Fatalf("Failed to initialize filestore")
+	}
 
 	rs, err := controller.MakeResourceStore(fileStore, []string{etcdUrl})
 	if err != nil {