Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r14412 -r14426
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 14412)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 14426)
@@ -146,8 +146,11 @@
 
 	@Override
 	public InvoicePlan getInvoicePlanById(String id) {
-		return (InvoicePlan) objectDao.getByProperty(
-				InvoicePlan.class.getSimpleName(), "id", Long.valueOf(id));
+		if(StringUtils.isNotBlank(id)){
+			return (InvoicePlan) objectDao.getByProperty(
+					InvoicePlan.class.getSimpleName(), "id", Long.valueOf(id));
+		}
+		return null;
 	}
 
 	@Override