diff --git a/k-meleon/kplugins/macros2/macros.cpp b/k-meleon/kplugins/macros2/macros.cpp
index 50959354..d11266f3 100644
--- a/k-meleon/kplugins/macros2/macros.cpp
+++ b/k-meleon/kplugins/macros2/macros.cpp
@@ -793,14 +793,14 @@ int GetCmds(kmeleonCommand* cmdList, long size)
 	int count = 0;
 	TDS::iterator iter;   
 	for( iter = M->tds.begin(); iter != M->tds.end(); iter++ ) {
-		if (iter->second.ismacro() && iter->second.md->macroInfo)
+		if (iter->second.ismacro() && iter->second.md && iter->second.md->macroInfo)
 			count++;
 	}
 	if (!cmdList || !count) return count;
 
 	count = 0;
 	for( iter = M->tds.begin(); iter != M->tds.end(); iter++ ) {
-		if (!iter->second.ismacro() || !iter->second.md->macroInfo)
+		if (!iter->second.ismacro() || !iter->second.md || !iter->second.md->macroInfo)
 			continue;
 
 		Context c = {NULL};