diff --git a/C/cdmgr.c b/C/cdmgr.c
index cc310efe9..117a85695 100644
--- a/C/cdmgr.c
+++ b/C/cdmgr.c
@@ -11,8 +11,12 @@
 * File:		cdmgr.c							 *
 * comments:	Code manager						 *
 *									 *
-* Last rev:     $Date: 2004-05-13 20:54:57 $,$Author: vsc $						 *
+* Last rev:     $Date: 2004-05-13 21:36:45 $,$Author: vsc $						 *
 * $Log: not supported by cvs2svn $
+* Revision 1.121  2004/05/13 20:54:57  vsc
+* debugger fixes
+* make sure we always go back to current module, even during initizlization.
+*
 * Revision 1.120  2004/04/27 16:21:16  vsc
 * stupid bug
 *
@@ -2373,11 +2377,11 @@ search_for_static_predicate_in_use(PredEntry *p, int check_everything)
   choiceptr b_ptr = B;
   CELL *env_ptr = ENV;
 
-  if (check_everything) {
+  if (check_everything && P) {
     PredEntry *pe = EnvPreg(P);
-    if (p == pe) return(TRUE);
+    if (p == pe) return TRUE;
     pe = EnvPreg(CP);
-    if (p == pe) return(TRUE);
+    if (p == pe) return TRUE;
   }
   do {
     /* check first environments that are younger than our latest choicepoint */
diff --git a/C/save.c b/C/save.c
index 7e6b81628..73af664f6 100644
--- a/C/save.c
+++ b/C/save.c
@@ -1411,9 +1411,7 @@ Restore(char *s, char *lib_dir)
   restore_regs(restore_mode);
   in_limbo = FALSE;
   /*#endif*/
-  fprintf(stderr,"1 CurrentModule is %p\n", CurrentModule);
   RestoreHeap(old_ops);
-  fprintf(stderr,"1.5 CurrentModule is %p\n", CurrentModule);
   switch(restore_mode) {
   case DO_EVERYTHING:
     if (OldHeapBase != Yap_HeapBase ||