diff --git a/engine/version.go b/engine/version.go
index 35587b93e..0345a9256 100644
--- a/engine/version.go
+++ b/engine/version.go
@@ -74,15 +74,14 @@ func CheckVersions(storage Storage) error {
 			return fmt.Errorf("No versions defined: please backup cgrates data and run : <cgr-migrator -exec=*set_versions>")
 		}
 		// no data, safe to write version
-		if err := OverwriteDBVersions(storage); err != nil {
-			return err
-		}
-	} else {
-		// comparing versions
-		message := dbVersion.Compare(x, storType, isDataDB)
-		if message != "" {
-			return fmt.Errorf("Migration needed: please backup cgr data and run : <%s>", message)
-		}
+		return OverwriteDBVersions(storage)
+	} else if err != nil {
+		return err
+	}
+	// comparing versions
+	message := dbVersion.Compare(x, storType, isDataDB)
+	if message != "" {
+		return fmt.Errorf("Migration needed: please backup cgr data and run : <%s>", message)
 	}
 	return nil
 }
diff --git a/integration_test.sh b/integration_test.sh
index 28f11badc..6978be900 100755
--- a/integration_test.sh
+++ b/integration_test.sh
@@ -218,6 +218,6 @@ results+=($?)
 
 pass=1
 for val in ${results[@]}; do
-   (( pass=$pass&&$val))
+   (( pass=$pass||$val))
 done
 exit $pass
\ No newline at end of file