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 8ec4a065..35948b1c 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
@@ -170,8 +170,9 @@ public class CategoryREST extends AbstractREST {
 									.isImageProxyEnabled()));
 				}
 				entries.setName(parent.getName());
+			} else {
+				return Response.status(Status.NOT_FOUND).entity("<message>category not found</message>").build();
 			}
-
 		}
 
 		boolean hasMore = entries.getEntries().size() > limit;
@@ -200,7 +201,11 @@ public class CategoryREST extends AbstractREST {
 		int offset = 0;
 		int limit = 20;
 
-		Entries entries = (Entries) getCategoryEntries(id, readType, null, offset, limit, order, null, false, null).getEntity();
+		Response response = getCategoryEntries(id, readType, null, offset, limit, order, null, false, null);
+		if (response.getStatus() != Status.OK.getStatusCode()) {
+			return response;
+		}
+		Entries entries = (Entries) response.getEntity();
 
 		SyndFeed feed = new SyndFeedImpl();
 		feed.setFeedType("rss_2.0");
diff --git a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
index 8c6dbc9f..97638ab4 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
@@ -181,6 +181,8 @@ public class FeedREST extends AbstractREST {
 				entries.setHasMore(true);
 				entries.getEntries().remove(entries.getEntries().size() - 1);
 			}
+		} else {
+			return Response.status(Status.NOT_FOUND).entity("<message>feed not found</message>").build();
 		}
 
 		entries.setTimestamp(System.currentTimeMillis());
@@ -202,7 +204,11 @@ public class FeedREST extends AbstractREST {
 		int offset = 0;
 		int limit = 20;
 
-		Entries entries = (Entries) getFeedEntries(id, readType, null, offset, limit, order, null, false).getEntity();
+		Response response = getFeedEntries(id, readType, null, offset, limit, order, null, false);
+		if (response.getStatus() != Status.OK.getStatusCode()) {
+			return response;
+		}
+		Entries entries = (Entries) response.getEntity();
 
 		SyndFeed feed = new SyndFeedImpl();
 		feed.setFeedType("rss_2.0");