diff --git a/jasspa/macros/pytools.emf b/jasspa/macros/pytools.emf
index 0fca7e3..3f4f9e5 100644
--- a/jasspa/macros/pytools.emf
+++ b/jasspa/macros/pytools.emf
@@ -3,7 +3,7 @@
 ;  Created By    : Detlef Groth, University of Potsdam
 ;  Author        : Detlef Groth, University of Potsdam
 ;  Created       : Wed Sep 25 15:42:35 2024
-;  Last Modified : <241225.1019>
+;  Last Modified : <241225.1026>
 ;
 ;  Description   : Documentation viewer within MicroEmacs for
 ;                  Python  
@@ -80,7 +80,7 @@ define-macro py-format
   !endif 
   !if &not &seq $buffer-fhook "fhook-python"
       ml-write &spr "Error: '%s' is not a Python file!" $buffer-bname
-      !return
+      !abort
   !endif
   !force set-variable #l1 .format
   !if &seq #l1 "ERROR"
@@ -116,7 +116,7 @@ define-macro py-lint
   !endif 
   !if &not &seq $buffer-fhook "fhook-python"
       ml-write &spr "Error: '%s' is not a Python file!" $buffer-bname
-      !return
+      !abort
   !endif
   !force set-variable #l0 .lint
   !if &seq #l0 "ERROR"
@@ -173,7 +173,7 @@ define-macro py-exec
   !endif 
   !if &not &seq $buffer-fhook "fhook-python"
       ml-write &spr "Error: '%s' is not a Python file!" $buffer-bname
-      !return
+      !abort
   !endif
   ; command line arguments
   set-variable #l1 ""
diff --git a/jasspa/macros/rtools.emf b/jasspa/macros/rtools.emf
index f435ff2..8828377 100644
--- a/jasspa/macros/rtools.emf
+++ b/jasspa/macros/rtools.emf
@@ -3,7 +3,7 @@
 ;  Author        : Detlef Groth, University of Potsdam, Germany
 ;  Created By    : Detlef Groth
 ;  Created       : Wed Dec 4 17:39:58 2024
-;  Last Modified : <241225.1017>
+;  Last Modified : <241225.1039>
 ;
 ;  Description   : functions useful to be used for R development
 ;
@@ -25,7 +25,7 @@ define-macro r-format
   !endif 
   !if &not &seq $buffer-fhook "fhook-r"
       ml-write &spr "Error: '%s' is not an R file!" $buffer-bname
-      !return
+      !abort
   !endif
   !if &seq %rscript-com "ERROR"
     r-rscript
@@ -48,7 +48,7 @@ define-macro r-lint
   !endif
   !if &not &seq $buffer-fhook "fhook-r"
     ml-write &spr "Error: '%s' is not an R file!" $buffer-bname
-    !return
+    !abort
   !endif
   set-variable #l0 &reg &spr "/history/%s/char-set" %platform ""
   set-variable #l0 &xre #l0 "iso" "ISO-" #l0
@@ -143,7 +143,7 @@ define-macro r-exec
   !endif 
   !if &not &seq $buffer-fhook "fhook-r"
       ml-write &spr "Error: '%s' is not an R file!" $buffer-bname
-      !return
+      !abort
   !endif
   !if &seq %rscript-com "ERROR"
     r-rscript