diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java b/rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java
index 1e5ac46b63110b119b51c45cf034ba33e17908e0..de4428df9f88304e9b3591f8c7f2d899d4935bda 100644
--- a/rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java
+++ b/rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java
@@ -241,7 +241,7 @@ public class OverlayRestImpl extends BaseRestImpl {
       layoutDao.update(layout);
       return getOverlayById(token, layout.getModel().getProject().getProjectId(), overlayId);
     } catch (NumberFormatException e) {
-      throw new ObjectNotFoundException("overlay doesn't exist");
+      throw new QueryException("invliad overlay id", e);
     }
   }
 
@@ -314,7 +314,8 @@ public class OverlayRestImpl extends BaseRestImpl {
   }
 
   public Map<String, Object> addOverlay(String token, String projectId, String name, String description, String content,
-      String fileId, String filename, String type, String googleLicenseConsent) throws SecurityException, QueryException, IOException {
+      String fileId, String filename, String type, String googleLicenseConsent)
+      throws SecurityException, QueryException, IOException {
     User user = getUserService().getUserByToken(token);
     if (Configuration.ANONYMOUS_LOGIN.equals(user.getLogin())) {
       throw new SecurityException("You have no privileges to add overlay");
@@ -355,9 +356,10 @@ public class OverlayRestImpl extends BaseRestImpl {
         }
       }
 
-      Layout layout = layoutService.createLayout(new CreateLayoutParams().async(false).colorInputStream(stream)
-          .description(description).layoutFileName(filename).model(model).name(name).user(user)
-          .colorSchemaType(colorSchemaType).directory(".").googleLicenseConsent(googleLicenseConsent.equalsIgnoreCase("true")));
+      Layout layout = layoutService
+          .createLayout(new CreateLayoutParams().async(false).colorInputStream(stream).description(description)
+              .layoutFileName(filename).model(model).name(name).user(user).colorSchemaType(colorSchemaType)
+              .directory(".").googleLicenseConsent(googleLicenseConsent.equalsIgnoreCase("true")));
 
       int count = layoutService.getCustomLayouts(model, token, false, user).size();
       layout.setOrderIndex(count);