diff --git a/src/main/java/no/nibio/vips/coremanager/service/ManagerResourceImpl.java b/src/main/java/no/nibio/vips/coremanager/service/ManagerResourceImpl.java
index 620dfe8b8e8f228c4415c343d927ccdaaa762abb..3d485606a530be9d1f7e05d01600c2056e66baba 100644
--- a/src/main/java/no/nibio/vips/coremanager/service/ManagerResourceImpl.java
+++ b/src/main/java/no/nibio/vips/coremanager/service/ManagerResourceImpl.java
@@ -379,7 +379,8 @@ public class ManagerResourceImpl implements ManagerResource{
                 // Deserialize the exception into string
                 String res = resp.readEntity(String.class);
                 // Log it
-                log.setMessage(res.substring(0,2047));
+                Integer substrEnd = Math.min(2047, res.length());
+                log.setMessage(res.substring(0,substrEnd));
                 ControllerGetter.getUserController().storeModelUsageLog(log);
                 // Send exception
                 throw new WebApplicationException(Response.status(resp.getStatus()).entity(res).build());