diff --git a/src/compiler.c b/src/compiler.c
index 53e51ce..d0d353e 100644
--- a/src/compiler.c
+++ b/src/compiler.c
@@ -1853,7 +1853,8 @@ checkWellFormed (const System sys)
 {
   int thisRole (Protocol p, Role r)
   {
-    return WellFormedRole (sys, p, r);
+    WellFormedRole (sys, p, r);
+    return true;
   }
 
   iterateRoles (sys, thisRole);
diff --git a/src/intruderknowledge.c b/src/intruderknowledge.c
index 523f47a..44a5f53 100644
--- a/src/intruderknowledge.c
+++ b/src/intruderknowledge.c
@@ -12,11 +12,12 @@ addSTerm (const System sys, Term t, Termlist fromlist, Termlist tolist)
 
   t2 = termLocal (t, fromlist, tolist);
 
-  /*
-     eprintf ("[ Adding ");
-     termPrint (t2);
-     eprintf (" to the initial intruder knowledge]\n");
-   */
+  if (switches.check)
+    {
+      eprintf ("[ Adding ");
+      termPrint (t2);
+      eprintf (" to the initial intruder knowledge]\n");
+    }
 }
 
 //! Unfold the term for all possible options
diff --git a/src/role.c b/src/role.c
index c878c53..d7681ec 100644
--- a/src/role.c
+++ b/src/role.c
@@ -491,6 +491,7 @@ WellFormedEvent (Term role, Knowledge know, Roledef rd)
 		    NULL);
 	  return NULL;
 	}
+      return know;
     }
   if (rd->type == CLAIM)
     {
@@ -500,7 +501,12 @@ WellFormedEvent (Term role, Knowledge know, Roledef rd)
 	  wfeError (know, rd, "Claiming role incorrect.", rd->from, role);
 	  return NULL;
 	}
+      return know;
     }
   // Unknown, false
+  globalError++;
+  roledefPrint (rd);
+  globalError--;
+  error ("I don't know this event");
   return NULL;
 }