Index: toltcl/generic/tolaccess.cpp
===================================================================
--- toltcl/generic/tolaccess.cpp	(revision 20663cb2fa77000c38eda5e84159f81cb7e562aa)
+++ toltcl/generic/tolaccess.cpp	(revision 88df01a08c0ef84a50fd3459781570f84c1ef5bd)
@@ -1662,16 +1662,16 @@
   if(obj)
   {
-    if(obj->Mode()==BUSERFUNMODE)
+    if( obj->Mode( ) == BUSERFUNMODE )
     {
-      opr = dynamic_cast<BOperator*>(obj);
+      opr = dynamic_cast<BOperator*>( obj );
     }    
-    if(obj->Mode()==BOBJECTMODE)
+    if( obj->Mode( ) == BOBJECTMODE )
     {
       BUserCode *uc = dynamic_cast<BUserCode*>( obj );
-      opr = uc->Contens().Operator( );
-      if(opr && (opr->Grammar( ) != G)) { opr = NULL; }
-    }
-  }
-  return(opr);
+      opr = uc ? uc->Contens().Operator( ) : NULL;
+      if( opr && ( opr->Grammar( ) != G ) ) { opr = NULL; }
+    }
+  }
+  return( opr );
 }