diff --git a/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java b/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
index 62de16a3..ad272547 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
@@ -270,6 +270,9 @@ public class CategoryREST extends AbstractResourceREST {
 
 		FeedCategory category = feedCategoryDAO.findById(getUser(),
 				Long.valueOf(req.getId()));
+		if (category == null) {
+			return Response.status(Status.NOT_FOUND).build();
+		}
 		category.setCollapsed(req.isCollapse());
 		feedCategoryDAO.update(category);