diff --git a/forth/bootstrap/interpreter.fs b/forth/bootstrap/interpreter.fs
index de66c5c..70e4650 100644
--- a/forth/bootstrap/interpreter.fs
+++ b/forth/bootstrap/interpreter.fs
@@ -92,6 +92,7 @@
       -21 of s" undefined method." type endof
       -22 of s" no such device." type endof
       dup s" Exception #" type . 
+      0 state !
     endcase
   else
     state @ 0= if
diff --git a/forth/device/package.fs b/forth/device/package.fs
index 0e1bb21..63a7586 100644
--- a/forth/device/package.fs
+++ b/forth/device/package.fs
@@ -10,7 +10,7 @@
 
 \ variable last-package 0 last-package !
 \ 0 value active-package
-
+: current-device active-package ;
   
 \ 
 \ 5.3.4.1 Open/Close packages (part 1)