diff --git a/src/buildno.h b/src/buildno.h
index f69bc269f..b04d7a51f 100644
--- a/src/buildno.h
+++ b/src/buildno.h
@@ -1,3 +1,3 @@
 #define VERSION_MAJOR 3
-#define VERSION_MINOR 3
-#define VERSION_BUILD 687
+#define VERSION_MINOR 4
+#define VERSION_BUILD 689
diff --git a/src/economy.c b/src/economy.c
index c7f7d7dce..b6e204abe 100644
--- a/src/economy.c
+++ b/src/economy.c
@@ -2385,7 +2385,7 @@ static bool sell(unit * u, request ** sellorders, struct order *ord)
         }
     }
     else {
-        n = atoi((const char *)s);
+        n = s ? atoi(s) : 0;
         if (n == 0) {
             cmistake(u, ord, 27, MSG_COMMERCE);
             return false;
diff --git a/src/kernel/faction.c b/src/kernel/faction.c
index b1adb70eb..2f58b994b 100755
--- a/src/kernel/faction.c
+++ b/src/kernel/faction.c
@@ -249,7 +249,7 @@ faction *addfaction(const char *email, const char *password,
     char buf[128];
 
     if (set_email(&f->email, email) != 0) {
-        log_error("Invalid email address for faction %s: %s\n", itoa36(f->no), email);
+        log_warning("Invalid email address for faction %s: %s\n", itoa36(f->no), email);
     }
 
     faction_setpassword(f, password);
diff --git a/src/laws.c b/src/laws.c
index 474f37299..e22824789 100755
--- a/src/laws.c
+++ b/src/laws.c
@@ -924,7 +924,7 @@ int quit_cmd(unit * u, struct order *ord)
     keyword_t kwd;
     
     kwd = init_order(ord);
-    assert(kwd == K_PASSWORD);
+    assert(kwd == K_QUIT);
     passwd = getstrtoken();
     if (checkpasswd(f, (const char *)passwd, false)) {
         if (EnhancedQuit()) {