diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java
index c47e2ca..025a1c3 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java
@@ -246,7 +246,10 @@ public class FilesStorage {
 			IClient client = new StorageClient(user, AccessType.PUBLIC, MemoryType.VOLATILE).getClient();
 
 			try (InputStream is = client.get().RFileAsInputStream(storageId)) {
-
+				if(is==null){
+					logger.error("Error in storage input stream is null for storageId :"+storageId);
+					throw new TDGWTServiceException("Error in storage input stream is null for storageId :"+storageId);
+				}
 				StorageHubClient shc = new StorageHubClient();
 				FolderContainer folderContainer = shc.open(folderId).asFolder();
 				FileContainer fileContainer = folderContainer.uploadFile(is, name, description);