diff --git a/service/src/main/java/lcsb/mapviewer/services/impl/FileService.java b/service/src/main/java/lcsb/mapviewer/services/impl/FileService.java
index 97ff42bdc89be1d5d781b35b95914860e5dd5e22..8690ac68f5c7d097055ccd1974c3d05ae795a043 100644
--- a/service/src/main/java/lcsb/mapviewer/services/impl/FileService.java
+++ b/service/src/main/java/lcsb/mapviewer/services/impl/FileService.java
@@ -28,8 +28,9 @@ public class FileService implements IFileService {
   @Override
   public User getOwnerByFileId(int id) {
     UploadedFileEntry entry = uploadedFileEntryDao.getById(id);
-    if (entry != null) {
-      uploadedFileEntryDao.getById(id).getOwner().getLogin();
+    if (entry != null && entry.getOwner() != null) {
+      //it's lazy initialized
+      entry.getOwner().getLogin();
       return uploadedFileEntryDao.getById(id).getOwner();
     } else {
       return null;