Index: /branches/eraser6/6.0/ShellExt/CtxMenu.cpp
===================================================================
--- /branches/eraser6/6.0/ShellExt/CtxMenu.cpp	(revision 2260)
+++ /branches/eraser6/6.0/ShellExt/CtxMenu.cpp	(revision 2261)
@@ -186,5 +186,5 @@
 		FORMATETC fmt = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
 		STGMEDIUM stg = { TYMED_HGLOBAL };
-		if (FAILED(pDataObj->GetData(&fmt, &stg)))
+		if (!pDataObj || FAILED(pDataObj->GetData(&fmt, &stg)))
 			//Nope! Return an "invalid argument" error back to Explorer.
 			return E_INVALIDARG;