diff --git a/ChangeLog b/ChangeLog
index 570d6141d..e316f4084 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-30  Mike Kestner  <mkestner@novell.com>
+
+	* generator/ClassBase.cs: null check ifaces in recursive method
+	and signal lookup.
+
 2008-01-29  Mike Kestner  <mkestner@novell.com>
 
 	* generator/ManagedCallString (Setup): use error param name instead
diff --git a/generator/ClassBase.cs b/generator/ClassBase.cs
index f791a2045..93f5ff284 100644
--- a/generator/ClassBase.cs
+++ b/generator/ClassBase.cs
@@ -355,6 +355,8 @@ namespace GtkSharp.Generation {
 			if (check_self && p == null) {
 				foreach (string iface in interfaces) {
 					ClassBase igen = SymbolTable.Table.GetClassGen (iface);
+					if (igen == null)
+						continue;
 					p = igen.GetMethodRecursively (name, true);
 					if (p != null)
 						break;
@@ -392,6 +394,8 @@ namespace GtkSharp.Generation {
 			if (check_self && p == null) {
 				foreach (string iface in interfaces) {
 					ClassBase igen = SymbolTable.Table.GetClassGen (iface);
+					if (igen == null)
+						continue;
 					p = igen.GetSignalRecursively (name, true);
 					if (p != null)
 						break;