diff --git a/conn.go b/conn.go
index 50a552cd0..c6a345e57 100644
--- a/conn.go
+++ b/conn.go
@@ -74,12 +74,17 @@ func uploadHandler(c *gin.Context) {
 		return
 	}
 
-	if data.Signature == "" {
-		c.String(http.StatusBadRequest, "signature is required")
-		return
-	}
+	if data.Extra.Network == false {
+		if data.Signature == "" {
+			c.String(http.StatusBadRequest, "signature is required")
+			return
+		}
+
+		if data.Commandline == "" {
+			c.String(http.StatusBadRequest, "commandline is required for local board")
+			return
+		}
 
-	if data.Extra.Network {
 		err := verifyCommandLine(data.Commandline, data.Signature)
 
 		if err != nil {
@@ -88,16 +93,12 @@ func uploadHandler(c *gin.Context) {
 		}
 	}
 
-	if data.Extra.Network == false && data.Commandline == "" {
-		c.String(http.StatusBadRequest, "commandline is required for local board")
-		return
-	}
-
 	buffer := bytes.NewBuffer(data.Hex)
 
 	path, err := saveFileonTempDir(data.Filename, buffer)
 	if err != nil {
 		c.String(http.StatusBadRequest, err.Error())
+		return
 	}
 
 	if data.Rewrite != "" {