2 files changed, 9 insertions, 8 deletions
diff --git a/src/main.cpp b/src/main.cpp
index e53089c0..052f86c5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -80,9 +80,15 @@ bool running = true;      /**< Determines if server keeps running */
 Skill skillTree("base");  /**< Skill tree */
 
 Configuration config;     /**< XML config reader */
-AccountHandler *accountHandler = new AccountHandler(); /**< Account message handler */
-ChatHandler *chatHandler = new ChatHandler(); /**< Communications (chat) messaqge handler */
-GameHandler *gameHandler = new GameHandler(); /**< Core game message handler */
+
+/** Account message handler */
+AccountHandler *accountHandler = new AccountHandler();
+
+/** Communications (chat) message handler */
+ChatHandler *chatHandler = new ChatHandler();
+
+/** Core game message handler */
+GameHandler *gameHandler = new GameHandler();
 
 ConnectionHandler connectionHandler; /**< Primary connection handler */
 
diff --git a/src/storage.cpp b/src/storage.cpp
index adea90e6..d2a875b1 100644
--- a/src/storage.cpp
+++ b/src/storage.cpp
@@ -71,11 +71,6 @@ Storage::instance(const std::string& name)
         mName = name;
     }
 
-    // check that the instance has been created.
-    if (mInstance == 0) {
-        throw std::bad_alloc();
-    }
-
     return (*mInstance);
 }