diff --git a/src/main/java/eu/h2020/symbiote/service/RAPEdmController.java b/src/main/java/eu/h2020/symbiote/service/RAPEdmController.java
index ef5121a..7d4ec63 100644
--- a/src/main/java/eu/h2020/symbiote/service/RAPEdmController.java
+++ b/src/main/java/eu/h2020/symbiote/service/RAPEdmController.java
@@ -138,7 +138,7 @@ private ResponseEntity<String> processRequestPrivate(HttpServletRequest req) thr
 
             httpStatus = HttpStatus.valueOf(response.getStatusCode());            
         } catch (IOException | ODataException e) {
-            responseStr = sendFailMessage(req, e.getMessage());
+            responseStr = sendFailMessage(req, e.getClass().getName() + ": " + e.getMessage());
             log.error(e.getMessage(), e);
             httpStatus = HttpStatus.INTERNAL_SERVER_ERROR;
         }
diff --git a/src/main/java/eu/h2020/symbiote/service/StorageHelper.java b/src/main/java/eu/h2020/symbiote/service/StorageHelper.java
index 3909dce..596b41c 100644
--- a/src/main/java/eu/h2020/symbiote/service/StorageHelper.java
+++ b/src/main/java/eu/h2020/symbiote/service/StorageHelper.java
@@ -289,7 +289,7 @@ public RapPluginResponse setService(List<ResourceInfo> resourceInfoList, String
                 pluginId = lst.get(0).getPlatformId();
             }
             
-            if("Service".equals(type)) {
+            if(type.toLowerCase().startsWith("service")) {
                 requestBody = "[" + requestBody + "]";
             }