diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java
index a73baa90cb..2958d5b3a0 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java
@@ -89,11 +89,13 @@ public class AnalyticsArtifactsManagementServiceImpl
                 return Response.serverError().entity(errMsg).build();
             }
         } catch (ArtifactAlreadyExistsException e) {
-            String errMsg = "Failed to create Stream artifact for tenant domain: " + tenantDomain;
+            String errMsg = "Failed to create Stream artifact for tenant domain: " + tenantDomain +
+                            "Stream with id: "+ id + "already exists";
             log.error(errMsg, e);
             return Response.status(Response.Status.BAD_REQUEST).entity(errMsg).build();
         } catch (NotFoundException e) {
-            String errMsg = "Failed to edit Stream artifact for tenant domain: " + tenantDomain;
+            String errMsg = "Failed to edit Stream artifact for tenant domain: " + tenantDomain +
+                            "Stream with id: "+ id + "doesn't exist";
             log.error(errMsg, e);
             return Response.status(Response.Status.NOT_FOUND).entity(errMsg).build();
         } catch (AxisFault e) {