diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
index df3c86aaa..bc64d4071 100644
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
@@ -508,20 +508,20 @@ void IdEditDialog::updateId()
 
 	mEditGroup.mMeta.mGroupName = groupname;
 
-        const QPixmap *pixmap = ui.avatarLabel->pixmap();
+	const QPixmap *pixmap = ui.avatarLabel->pixmap();
 
-    if (!pixmap->isNull())
-    {
-        QByteArray ba;
-        QBuffer buffer(&ba);
+	if (pixmap && !pixmap->isNull())
+	{
+		QByteArray ba;
+		QBuffer buffer(&ba);
 
-        buffer.open(QIODevice::WriteOnly);
-        pixmap->save(&buffer, "PNG"); // writes image into ba in PNG format
+		buffer.open(QIODevice::WriteOnly);
+		pixmap->save(&buffer, "PNG"); // writes image into ba in PNG format
 
-        mEditGroup.mImage.copy((uint8_t *) ba.data(), ba.size());
-    }
-    else
-        mEditGroup.mImage.clear();
+		mEditGroup.mImage.copy((uint8_t *) ba.data(), ba.size());
+	}
+	else
+		mEditGroup.mImage.clear();
 
 	uint32_t dummyToken = 0;
 	rsIdentity->updateIdentity(dummyToken, mEditGroup);
@@ -551,4 +551,4 @@ void IdEditDialog::removeAvatar()
 	
 	uint32_t dummyToken = 0;
 	rsIdentity->updateIdentity(dummyToken, mEditGroup);
-}
\ No newline at end of file
+}