diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index 6de718ae1a9..d438b810502 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -183,10 +183,14 @@ BOOL WINAPI ILGetDisplayName(LPCITEMIDLIST pidl, LPVOID path)
  *   observed: pidl=Desktop return=pidl
  */
 LPITEMIDLIST WINAPI ILFindLastID(LPCITEMIDLIST pidl)
-{	LPCITEMIDLIST   pidlLast = pidl;
+{
+	LPCITEMIDLIST   pidlLast = pidl;
 
 	TRACE("(pidl=%p)\n",pidl);
 
+	if (!pidl)
+	  return NULL;
+
 	while (pidl->mkid.cb)
 	{
 	  pidlLast = pidl;