diff --git a/source/birchwood/client/exceptions.d b/source/birchwood/client/exceptions.d
index db01916..1005708 100644
--- a/source/birchwood/client/exceptions.d
+++ b/source/birchwood/client/exceptions.d
@@ -66,7 +66,12 @@ public enum ErrorType
      * If invalid parameters are passed
      * to any of the text formatting functions
      */
-    INVALID_FORMATTING
+    INVALID_FORMATTING,
+
+    /** 
+     * If a key-lookup in the ConnInfo failed
+     */
+    DB_KEY_NOT_FOUND
 }
 
 /** 
diff --git a/source/birchwood/config/conninfo.d b/source/birchwood/config/conninfo.d
index 934fc98..c6e921b 100644
--- a/source/birchwood/config/conninfo.d
+++ b/source/birchwood/config/conninfo.d
@@ -136,8 +136,7 @@ public shared struct ConnectionInfo
         }
         else
         {
-            // TODO: Should throw an exception
-            return "";
+            throw new BirchwoodException(ErrorType.DB_KEY_NOT_FOUND, "Could not find key '"~key~"'");
         }
     }