diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp
index d11d2f91c..12fb804a1 100644
--- a/src/driver/framebuffer.cpp
+++ b/src/driver/framebuffer.cpp
@@ -841,11 +841,15 @@ void CFrameBuffer::setIconBasePath(const std::string & iconPath)
 
 void CFrameBuffer::getIconSize(const char * const filename, int* width, int *height)
 {
-	std::map<std::string, rawIcon>::iterator it;
-
 	*width = 0;
 	*height = 0;
 
+	if(filename == NULL)
+		return;
+
+	std::map<std::string, rawIcon>::iterator it;
+
+
 	/* if code ask for size, lets cache it. assume we have enough ram for cache */
 	/* FIXME offset seems never used in code, always default = 1 ? */