diff --git a/src/main/java/net/frozenorb/apiv3/APIv3.java b/src/main/java/net/frozenorb/apiv3/APIv3.java
index e131a0b..7774d73 100644
--- a/src/main/java/net/frozenorb/apiv3/APIv3.java
+++ b/src/main/java/net/frozenorb/apiv3/APIv3.java
@@ -425,8 +425,14 @@ public final class APIv3 extends AbstractVerticle {
 
 	public static void respondJson(RoutingContext ctx, int code, Object response) {
 		ctx.response().putHeader(HttpHeaders.CONTENT_TYPE, MediaType.JSON_UTF_8.toString());
-		ctx.response().setStatusCode(code);
-		ctx.response().end(gson.toJson(response));
+
+		if (response == null) {
+			ctx.response().setStatusCode(404);
+			ctx.response().end("{}");
+		} else {
+			ctx.response().setStatusCode(code);
+			ctx.response().end(gson.toJson(response));
+		}
 	}
 
 }
\ No newline at end of file