diff --git a/backend/app/cmd/server.go b/backend/app/cmd/server.go
index 8247a900..f9a44d66 100644
--- a/backend/app/cmd/server.go
+++ b/backend/app/cmd/server.go
@@ -197,6 +197,7 @@ func (s *ServerCommand) Execute(args []string) error {
 	app, err := s.newServerApp()
 	if err != nil {
 		log.Printf("[PANIC] failed to setup application, %+v", err)
+		return err
 	}
 	if err = app.run(ctx); err != nil {
 		log.Printf("[ERROR] remark terminated with error %+v", err)
@@ -432,7 +433,7 @@ func (s *ServerCommand) makePicturesStore() (image.Interface, error) {
 		if err := makeDirs(s.Image.FS.Path); err != nil {
 			return nil, err
 		}
-		return &image.FileSystem{Location: s.Image.FS.Path, Partitons: s.Image.FS.Partitons, MaxSize: s.Image.MaxSize}, nil
+		return &image.FileSystem{Location: s.Image.FS.Path, Partitions: s.Image.FS.Partitons, MaxSize: s.Image.MaxSize}, nil
 	}
 	return nil, errors.Errorf("unsupported pictures store type %s", s.Image.Type)
 }
diff --git a/backend/app/rest/api/rest_test.go b/backend/app/rest/api/rest_test.go
index c8663ac0..cd36233b 100644
--- a/backend/app/rest/api/rest_test.go
+++ b/backend/app/rest/api/rest_test.go
@@ -235,9 +235,9 @@ func startupT(t *testing.T) (ts *httptest.Server, srv *Rest, teardown func()) {
 		WebRoot:   "/tmp",
 		RemarkURL: "https://demo.remark42.com",
 		ImageService: &image.FileSystem{
-			Location:  "/tmp/pics-remark42",
-			Partitons: 100,
-			MaxSize:   10000,
+			Location:   "/tmp/pics-remark42",
+			Partitions: 100,
+			MaxSize:    10000,
 		},
 
 		ImageProxy:       &proxy.Image{},