diff --git a/common/src/main/java/ba/steleks/storage/FileSystemStorageService.java b/common/src/main/java/ba/steleks/storage/FileSystemStorageService.java
index 750d496..e906282 100644
--- a/common/src/main/java/ba/steleks/storage/FileSystemStorageService.java
+++ b/common/src/main/java/ba/steleks/storage/FileSystemStorageService.java
@@ -1,5 +1,7 @@
 package ba.steleks.storage;
 
+import ba.steleks.storage.error.exception.StorageException;
+import ba.steleks.storage.error.exception.StorageFileNotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
@@ -12,7 +14,6 @@ import java.net.MalformedURLException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.attribute.FileOwnerAttributeView;
 import java.util.stream.Stream;
 
 @Service
diff --git a/common/src/main/java/ba/steleks/storage/error/StorageErrorHandler.java b/common/src/main/java/ba/steleks/storage/error/StorageErrorHandler.java
new file mode 100644
index 0000000..80a904f
--- /dev/null
+++ b/common/src/main/java/ba/steleks/storage/error/StorageErrorHandler.java
@@ -0,0 +1,21 @@
+package ba.steleks.storage.error;/**
+ * Created by ensar on 16/04/17.
+ */
+
+import ba.steleks.storage.error.exception.StorageFileNotFoundException;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+import java.util.logging.Logger;
+
+@ControllerAdvice
+public class StorageErrorHandler {
+    private static final Logger logger =
+            Logger.getLogger(StorageErrorHandler.class.getName());
+
+    @ExceptionHandler(StorageFileNotFoundException.class)
+    public ResponseEntity handleStorageFileNotFound(StorageFileNotFoundException exc) {
+        return ResponseEntity.notFound().build();
+    }
+}
diff --git a/common/src/main/java/ba/steleks/storage/StorageException.java b/common/src/main/java/ba/steleks/storage/error/exception/StorageException.java
similarity index 83%
rename from common/src/main/java/ba/steleks/storage/StorageException.java
rename to common/src/main/java/ba/steleks/storage/error/exception/StorageException.java
index 013fdb5..190f9a6 100644
--- a/common/src/main/java/ba/steleks/storage/StorageException.java
+++ b/common/src/main/java/ba/steleks/storage/error/exception/StorageException.java
@@ -1,4 +1,4 @@
-package ba.steleks.storage;
+package ba.steleks.storage.error.exception;
 
 public class StorageException extends RuntimeException {
 
diff --git a/common/src/main/java/ba/steleks/storage/StorageFileNotFoundException.java b/common/src/main/java/ba/steleks/storage/error/exception/StorageFileNotFoundException.java
similarity index 85%
rename from common/src/main/java/ba/steleks/storage/StorageFileNotFoundException.java
rename to common/src/main/java/ba/steleks/storage/error/exception/StorageFileNotFoundException.java
index 2222d76..b1b8e08 100644
--- a/common/src/main/java/ba/steleks/storage/StorageFileNotFoundException.java
+++ b/common/src/main/java/ba/steleks/storage/error/exception/StorageFileNotFoundException.java
@@ -1,4 +1,4 @@
-package ba.steleks.storage;
+package ba.steleks.storage.error.exception;
 
 
 public class StorageFileNotFoundException extends StorageException {
diff --git a/events/src/main/java/ba/steleks/controller/EventGalleryController.java b/events/src/main/java/ba/steleks/controller/EventGalleryController.java
index 0c80ae2..ed42542 100644
--- a/events/src/main/java/ba/steleks/controller/EventGalleryController.java
+++ b/events/src/main/java/ba/steleks/controller/EventGalleryController.java
@@ -2,11 +2,10 @@ package ba.steleks.controller;
 
 import ba.steleks.error.exception.ExternalServiceException;
 import ba.steleks.model.Media;
-import ba.steleks.repository.EventsJpaRepository;
 import ba.steleks.repository.MediaJpaRepository;
+
 import ba.steleks.service.Service;
 import ba.steleks.service.discovery.ServiceDiscoveryClient;
-import ba.steleks.storage.StorageFileNotFoundException;
 import ba.steleks.storage.StorageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.ServiceInstance;
@@ -69,9 +68,4 @@ public class EventGalleryController {
 
         return "redirect:/";
     }
-
-    @ExceptionHandler(StorageFileNotFoundException.class)
-    public ResponseEntity handleStorageFileNotFound(StorageFileNotFoundException exc) {
-        return ResponseEntity.notFound().build();
-    }
 }
diff --git a/teams/src/main/java/ba/steleks/controller/TeamGalleryController.java b/teams/src/main/java/ba/steleks/controller/TeamGalleryController.java
index 1c21f33..437e7ee 100644
--- a/teams/src/main/java/ba/steleks/controller/TeamGalleryController.java
+++ b/teams/src/main/java/ba/steleks/controller/TeamGalleryController.java
@@ -5,7 +5,6 @@ import ba.steleks.model.TeamMedia;
 import ba.steleks.repository.TeamsMediaJpaRepository;
 import ba.steleks.service.Service;
 import ba.steleks.service.discovery.ServiceDiscoveryClient;
-import ba.steleks.storage.StorageFileNotFoundException;
 import ba.steleks.storage.StorageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.ServiceInstance;
@@ -70,9 +69,4 @@ public class TeamGalleryController {
         return "redirect:/";
     }
 
-    @ExceptionHandler(StorageFileNotFoundException.class)
-    public ResponseEntity handleStorageFileNotFound(StorageFileNotFoundException exc) {
-        return ResponseEntity.notFound().build();
-    }
-
 }
diff --git a/users/src/main/java/ba/steleks/controller/ProfilePictureController.java b/users/src/main/java/ba/steleks/controller/ProfilePictureController.java
index 179fe2f..32447ad 100644
--- a/users/src/main/java/ba/steleks/controller/ProfilePictureController.java
+++ b/users/src/main/java/ba/steleks/controller/ProfilePictureController.java
@@ -5,7 +5,6 @@ import ba.steleks.model.User;
 import ba.steleks.repository.UsersJpaRepository;
 import ba.steleks.service.Service;
 import ba.steleks.service.discovery.ServiceDiscoveryClient;
-import ba.steleks.storage.StorageFileNotFoundException;
 import ba.steleks.storage.StorageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
@@ -62,9 +61,4 @@ public class ProfilePictureController {
 
         return "redirect:/";
     }
-
-    @ExceptionHandler(StorageFileNotFoundException.class)
-    public ResponseEntity handleStorageFileNotFound(StorageFileNotFoundException exc) {
-        return ResponseEntity.notFound().build();
-    }
 }