diff --git a/mocha_server.py b/mocha_server.py
index dac35b8..21a2c3a 100755
--- a/mocha_server.py
+++ b/mocha_server.py
@@ -106,10 +106,6 @@ def fetch_user(user_id):
 
 def fetch_top_n(n):
     output = get_top_N('score', True, n)
-
-    if output == '[]':
-        output = None
-
     return output
 
 
@@ -126,12 +122,13 @@ def process_request(uri):
     output = None
 
     if len(parts) < 2:
-        return None
-
-    if parts[1] == 'users':
+        output = None
+    elif parts[1] == 'users':
         output = fetch_user(parts[2])
     elif parts[1] == 'top':
         output = fetch_top_n(parts[2])
+    else:
+        output = None
 
     return output