diff --git a/map.tin b/map.tin
index 0c01ca6..143abb6 100644
--- a/map.tin
+++ b/map.tin
@@ -51,9 +51,9 @@
 
 #alias dirpush #list dirs insert -1 %1
 #alias dirget #list dirs get 1 dir
-#alias dirpop {#list dirs delete 1}
+#alias dirpop {#list dirs size dirsize;#if {$dirsize == 0} {#nop} {#list dirs delete 1}}
 
-#alias dirmove {dirget;dirpop;#map move $dir;showmap}
+#alias dirmove {dirget;#if {"$dir" !== "0"} {dirpop;#map move $dir;showmap}}
 
 
 #alias exits #var exits %1