diff --git a/libraries/appbase b/libraries/appbase
index 21dee91e3a1..74c282f41f4 160000
--- a/libraries/appbase
+++ b/libraries/appbase
@@ -1 +1 @@
-Subproject commit 21dee91e3a1dc61e28581b56011132242c40e10a
+Subproject commit 74c282f41f479d958c74c948b73cb128e5cf3614
diff --git a/programs/nodeos/main.cpp b/programs/nodeos/main.cpp
index 460dd47ad05..a0cd7bd8682 100644
--- a/programs/nodeos/main.cpp
+++ b/programs/nodeos/main.cpp
@@ -76,8 +76,8 @@ enum return_codes {
    SUCCESS           = 0,
    BAD_ALLOC         = 1,
    DATABASE_DIRTY    = 2,
-   FIXED_REVERSIBLE  = 3,
-   EXTRACTED_GENESIS = 4,
+   FIXED_REVERSIBLE  = SUCCESS,
+   EXTRACTED_GENESIS = SUCCESS,
    NODE_MANAGEMENT_SUCCESS = 5
 };
 
@@ -93,8 +93,12 @@ int main(int argc, char** argv)
          .default_unix_socket_path = "",
          .default_http_port = 8888
       });
-      if(!app().initialize<chain_plugin, net_plugin, producer_plugin>(argc, argv))
+      if(!app().initialize<chain_plugin, net_plugin, producer_plugin>(argc, argv)) {
+         if(app().get_options().count("help") || app().get_options().count("version")) {
+            return SUCCESS;
+         }
          return INITIALIZE_FAIL;
+      }
       initialize_logging();
       ilog("${name} version ${ver}", ("name", nodeos::config::node_executable_name)("ver", app().version_string()));
       ilog("${name} using configuration file ${c}", ("name", nodeos::config::node_executable_name)("c", app().full_config_file_path().string()));