diff --git a/C/absmi.c b/C/absmi.c
index d585d3cd6..655755097 100644
--- a/C/absmi.c
+++ b/C/absmi.c
@@ -10,8 +10,11 @@
 *									 *
 * File:		absmi.c							 *
 * comments:	Portable abstract machine interpreter                    *
-* Last rev:     $Date: 2008-08-06 17:32:18 $,$Author: vsc $						 *
+* Last rev:     $Date: 2008-08-06 23:05:49 $,$Author: vsc $						 *
 * $Log: not supported by cvs2svn $
+* Revision 1.243  2008/08/06 17:32:18  vsc
+* more thread fixes
+*
 * Revision 1.242  2008/06/17 13:37:48  vsc
 * fix c_interface not to crash when people try to recover slots that are
 * not there.
@@ -1564,11 +1567,6 @@ Yap_absmi(int inp)
 
 	ASP = YREG+E_CB;
 	saveregs();
-	if (cl->ClSource == NULL) {
-	  fprintf(stderr,"%d  CLLLLL   %p %p %s\n",worker_id,cl,cl->ClSource,RepAtom(cl->ClPred->FunctorOfPred)->StrOfAE);
-	  exit(1);
-	  FAIL();
-	}
 	while ((t = Yap_FetchTermFromDB(cl->ClSource)) == 0L) {
 	  if (Yap_Error_TYPE == OUT_OF_ATTVARS_ERROR) {
 	    Yap_Error_TYPE = YAP_NO_ERROR;
diff --git a/pl/directives.yap b/pl/directives.yap
index c73979fd7..2b3c2e01e 100644
--- a/pl/directives.yap
+++ b/pl/directives.yap
@@ -23,42 +23,42 @@
 '$all_directives'(G) :- !,
 	'$directive'(G).
 
-'$directive'(multifile(_)).
-'$directive'(expects_dialect(_)).
-'$directive'(discontiguous(_)).
-'$directive'(initialization(_)).
-'$directive'(include(_)).
-'$directive'(module(_,_)).
-'$directive'(module(_,_,_)).
-'$directive'(meta_predicate(_)).
-'$directive'(module_transparent(_)).
-'$directive'(public(_)).
-'$directive'(dynamic(_)).
-'$directive'(noprofile(_)).
-'$directive'(op(_,_,_)).
-'$directive'(set_prolog_flag(_,_)).
-'$directive'(ensure_loaded(_)).
+'$directive'(block(_)).
 '$directive'(char_conversion(_,_)).
 '$directive'(compile(_)).
 '$directive'(consult(_)).
-'$directive'(reconsult(_)).
-'$directive'(sequential).
+'$directive'(discontiguous(_)).
+'$directive'(dynamic(_)).
+'$directive'(elif(_)).
+'$directive'(else).
+'$directive'(encoding(_)).
+'$directive'(endif).
+'$directive'(ensure_loaded(_)).
+'$directive'(expects_dialect(_)).
+'$directive'(if(_)).
+'$directive'(include(_)).
+'$directive'(initialization(_)).
+'$directive'(meta_predicate(_)).
+'$directive'(module(_,_)).
+'$directive'(module(_,_,_)).
+'$directive'(module_transparent(_)).
+'$directive'(multifile(_)).
+'$directive'(noprofile(_)).
 '$directive'(parallel).
+'$directive'(public(_)).
+'$directive'(op(_,_,_)).
+'$directive'(set_prolog_flag(_,_)).
+'$directive'(reconsult(_)).
+'$directive'(reexport(_)).
+'$directive'(reexport(_,_)).
+'$directive'(sequential).
 '$directive'(sequential(_)).
-'$directive'(block(_)).
-'$directive'(wait(_)).
+'$directive'(thread_local(_)).
+'$directive'(uncutable(_)).
 '$directive'(use_module(_)).
 '$directive'(use_module(_,_)).
 '$directive'(use_module(_,_,_)).
-'$directive'(thread_local(_)).
-'$directive'(uncutable(_)).
-'$directive'(encoding(_)).
-'$directive'(if(_)).
-'$directive'(else).
-'$directive'(elif(_)).
-'$directive'(endif).
-'$directive'(reexport(_)).
-'$directive'(reexport(_,_)).
+'$directive'(wait(_)).
 
 '$exec_directives'((G1,G2), Mode, M) :- !,
 	'$exec_directives'(G1, Mode, M),