diff --git a/clientapi/routing/filter.go b/clientapi/routing/filter.go
index 109c55da..1ed91cd2 100644
--- a/clientapi/routing/filter.go
+++ b/clientapi/routing/filter.go
@@ -62,7 +62,7 @@ func GetFilter(
 	filter := gomatrix.Filter{}
 	err = json.Unmarshal(res, &filter)
 	if err != nil {
-		httputil.LogThenError(req, err)
+		return httputil.LogThenError(req, err)
 	}
 
 	return util.JSONResponse{
diff --git a/clientapi/routing/login.go b/clientapi/routing/login.go
index abcf7f56..2e2d409f 100644
--- a/clientapi/routing/login.go
+++ b/clientapi/routing/login.go
@@ -107,7 +107,7 @@ func Login(
 
 		token, err := auth.GenerateAccessToken()
 		if err != nil {
-			httputil.LogThenError(req, err)
+			return httputil.LogThenError(req, err)
 		}
 
 		dev, err := getDevice(req.Context(), r, deviceDB, acc, localpart, token)