diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java
index 2719312..a843390 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java
@@ -790,7 +790,7 @@ public class LayerManager {
 				GWT.log("Adding images: " + listUI);
 				if (listUI != null && listUI.size() > 0) {
 					UploadedImageDV img = listUI.get(0);
-					if (img.getListWsContent() != null) {
+					if (img!= null && img.getListWsContent() != null) {
 						WorkspaceContentDV wsContent = img.getListWsContent().get(img.getListWsContent().size() - 1);
 						String theImgHTML = "<img src=\"" + wsContent.getLink() + "\"></img>";
 						GWT.log("theImgHTML: " + theImgHTML);