diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp
index 7fc044e9..d6d192ad 100644
--- a/libraries/app/application.cpp
+++ b/libraries/app/application.cpp
@@ -387,6 +387,9 @@ namespace detail {
       virtual bool handle_block(const graphene::net::block_message& blk_msg, bool sync_mode,
                                 std::vector<fc::uint160_t>& contained_transaction_message_ids) override
       { try {
+         if( !_chain_db->is_open() ) 
+              return false;
+
          auto latency = graphene::time::now() - blk_msg.block.timestamp;
          if (!sync_mode || blk_msg.block.block_num() % 10000 == 0)
          {
@@ -932,6 +935,8 @@ void application::shutdown_plugins()
 }
 void application::shutdown()
 {
+   if( my->_p2p_network )
+      my->_p2p_network->close();
    if( my->_chain_db )
       my->_chain_db->close();
 }