diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c
index 875d4a93cff..29d735d6ea6 100644
--- a/dlls/shell32/shell.c
+++ b/dlls/shell32/shell.c
@@ -978,9 +978,13 @@ HICON WINAPI ExtractAssociatedIconA(HINSTANCE hInst, LPSTR lpIconPath, LPWORD lp
  */
 HICON16 WINAPI ExtractAssociatedIcon16(HINSTANCE16 hInst, LPSTR lpIconPath, LPWORD lpiIcon)
 {	HICON16 hIcon;
+	DWORD dwDummyIcon = 0;
 
 	TRACE("\n");
 
+	if(lpiIcon == NULL)
+	    lpiIcon = &dwDummyIcon;
+
 	hIcon = ExtractIcon16(hInst, lpIconPath, *lpiIcon);
 
 	if( hIcon < 2 )