diff --git a/src/main/java/com/tarento/retail/controller/RoleActionController.java b/src/main/java/com/tarento/retail/controller/RoleActionController.java
index 9d9d26d150c2a6adf7e2aa97e25eb1697ae63f3b..69a0c239f4901c2cd132f9f6ea526837e41d59f7 100644
--- a/src/main/java/com/tarento/retail/controller/RoleActionController.java
+++ b/src/main/java/com/tarento/retail/controller/RoleActionController.java
@@ -45,13 +45,19 @@ public class RoleActionController {
 	}
 
 	@RequestMapping(value = PathRoutes.RoleActionRoutes.GET_ALL_ROLES, method = RequestMethod.GET)
-	public List<Role> listRoles(@RequestHeader(value = Constants.USER_INFO_HEADER, required = false) String xUserInfo) {
+	public String listRoles(@RequestHeader(value = Constants.USER_INFO_HEADER, required = false) String xUserInfo)
+			throws JsonProcessingException {
 		Long orgId = null;
 		if (StringUtils.isNotBlank(xUserInfo)) {
 			User userInfo = new Gson().fromJson(xUserInfo, User.class);
 			orgId = Long.parseLong(userInfo.getOrgId());
 		}
-		return roleActionService.getAllRoles(orgId);
+		orgId = 1L;
+		List<Role> rolesList = roleActionService.getAllRoles(orgId);
+		if (rolesList != null) {
+			return ResponseGenerator.successResponse(rolesList);
+		}
+		return ResponseGenerator.failureResponse(Constants.PROCESS_FAIL);
 	}
 
 	@RequestMapping(value = PathRoutes.RoleActionRoutes.GET_DEFAULT_ROLES_BY_DOMAIN, method = RequestMethod.GET)
diff --git a/src/main/java/com/tarento/retail/dao/impl/RoleDaoImpl.java b/src/main/java/com/tarento/retail/dao/impl/RoleDaoImpl.java
index f86f72a932a61dfc8d6998e20e11896501989e2c..39c4dd533104e93af448551d5f00d355487bd20b 100644
--- a/src/main/java/com/tarento/retail/dao/impl/RoleDaoImpl.java
+++ b/src/main/java/com/tarento/retail/dao/impl/RoleDaoImpl.java
@@ -145,6 +145,7 @@ public class RoleDaoImpl implements RoleDao {
 					new SqlDataMapper().new RoleMapper());
 		} catch (Exception e) {
 			LOGGER.error("Encountered an exception while fetching all roles" + e);
+			return null;
 		}
 		return roleList;
 	}