diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/avatar/imagepicker/EditPanel.java b/src/net/java/sip/communicator/impl/gui/main/presence/avatar/imagepicker/EditPanel.java
index 5b1394440..b8273c891 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/avatar/imagepicker/EditPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/avatar/imagepicker/EditPanel.java
@@ -160,6 +160,8 @@ public byte[] getClippedImage()
     {
         BufferedImage fullImage = getResizedImage(true);
 
+        if(fullImage == null)
+            return null;
 
         Rectangle clipping = this.imageClipper.getCroppedArea();
 
@@ -178,6 +180,9 @@ public byte[] getClippedImage()
      */
     private BufferedImage getResizedImage(boolean hq)
     {
+        if(this.image == null)
+            return null;
+
         BufferedImage i = null;
         int size = this.imageSizeSlider.getValue();
 
diff --git a/src/net/java/sip/communicator/plugin/desktoputil/FramedImage.java b/src/net/java/sip/communicator/plugin/desktoputil/FramedImage.java
index bd3fe622f..a60df4881 100644
--- a/src/net/java/sip/communicator/plugin/desktoputil/FramedImage.java
+++ b/src/net/java/sip/communicator/plugin/desktoputil/FramedImage.java
@@ -117,7 +117,9 @@ public void setImageIcon(Image image)
      */
     public Image getImage()
     {
-        return icon.getImage();
+        if(icon != null)
+            return icon.getImage();
+        return null;
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/desktoputil/FramedImageWithMenu.java b/src/net/java/sip/communicator/plugin/desktoputil/FramedImageWithMenu.java
index b46211b21..f50ca68f2 100644
--- a/src/net/java/sip/communicator/plugin/desktoputil/FramedImageWithMenu.java
+++ b/src/net/java/sip/communicator/plugin/desktoputil/FramedImageWithMenu.java
@@ -99,6 +99,20 @@ public void setImageIcon(ImageIcon imageIcon)
         this.currentImage = imageIcon.getImage();
     }
 
+    /**
+     * Sets the image to display in the frame.
+     *
+     * @param image the image to display in the frame
+     */
+    public void setImageIcon(byte[] image)
+    {
+        // Intercept the action to validate the user icon and not the default
+        super.setImageIcon(image);
+        this.isDefaultImage = false;
+
+        this.currentImage = super.getImage();
+    }
+
     /**
      * Returns the current image with no rounded corners. Only return the user
      * image and not the default image.