From a861387bd74f58e6825153fa6dcef281f166e5bb Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Fri, 14 Feb 2014 15:41:17 +0100
Subject: [PATCH] handle null categories

---
 .../com/commafeed/frontend/rest/resources/FeedREST.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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 5a4551bd..992d1059 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
@@ -265,7 +265,8 @@ public class FeedREST extends AbstractREST {
 		try {
 			info = fetchFeedInternal(req.getUrl());
 		} catch (Exception e) {
-			return Response.status(Status.INTERNAL_SERVER_ERROR).entity(Throwables.getStackTraceAsString(Throwables.getRootCause(e))).build();
+			return Response.status(Status.INTERNAL_SERVER_ERROR).entity(Throwables.getStackTraceAsString(Throwables.getRootCause(e)))
+					.build();
 		}
 		return Response.ok(info).build();
 	}
@@ -373,8 +374,10 @@ public class FeedREST extends AbstractREST {
 		try {
 			url = fetchFeedInternal(url).getUrl();
 
-			FeedCategory category = CategoryREST.ALL.equals(req.getCategoryId()) ? null : feedCategoryDAO.findById(Long.valueOf(req
-					.getCategoryId()));
+			FeedCategory category = null;
+			if (req.getCategoryId() != null && !CategoryREST.ALL.equals(req.getCategoryId())) {
+				category = feedCategoryDAO.findById(Long.valueOf(req.getCategoryId()));
+			}
 			FeedInfo info = fetchFeedInternal(url);
 			feedSubscriptionService.subscribe(getUser(), info.getUrl(), req.getTitle(), category);
 		} catch (Exception e) {