diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37eaa15..a5d1e40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.2)
 project(libravatarserv
-        VERSION 0.6.6
+        VERSION 0.6.7
         LANGUAGES CXX
 )
 
diff --git a/src/libravatarserv.cpp b/src/libravatarserv.cpp
index c1202be..2be1a9f 100644
--- a/src/libravatarserv.cpp
+++ b/src/libravatarserv.cpp
@@ -25,7 +25,7 @@ using std::endl;
 
 // Global variables
 std::map<const string, const string> hash::table;
-fs::path settings::avatar_dir = "";
+fs::path settings::avatar_dir;
 settings::Settings settings::settings;
 
 int main()
@@ -96,8 +96,9 @@ int main()
             }
             else
             {
-                cout << "Status: 404 Not Found\n\n";
                 cerr << "Error: Mystery person not found.\n";
+                // Jump to last else
+                goto not_implemented;
             }
         }
         else if (avatar.fallback.substr(0, 9) == "identicon")
@@ -116,6 +117,7 @@ int main()
         }
         else
         {
+            not_implemented:
             if (settings::settings.redirect_nofallback)
             {
                 http::send_redirect(avatar);