diff --git a/src/clfswm-internal.lisp b/src/clfswm-internal.lisp
index 0531d92f2d02e318760d17f4104e61f80056047c..d529b3da5b6ea72a823ef5882f09a53b341e52d0 100644
--- a/src/clfswm-internal.lisp
+++ b/src/clfswm-internal.lisp
@@ -709,7 +709,7 @@
         (return-from find-child-in-all-root root))))
 
   (defun find-current-root ()
-    (root-child (find-root (current-child))))
+    (root-child (find-root current-child)))
 
   (defun exchange-root-geometry (root-1 root-2)
     (when (and root-1 root-2)
@@ -746,9 +746,10 @@
     current-child)
 
   (defun current-child-setter (value)
-    (awhen (find-root value)
-      (setf (root-current-child it) value))
-    (setf current-child value))
+    (when value
+      (awhen (find-root value)
+        (setf (root-current-child it) value))
+      (setf current-child value)))
 
   (defmacro with-current-child ((new-child) &body body)
     "Temporarly change the current child"
diff --git a/src/version.lisp b/src/version.lisp
index 1866ea0d97292eb90a99bc0e1f49f2cd304ec17b..80d8d1d71e6c6afc5dc2fdf527d0266afe9a41d9 100644
--- a/src/version.lisp
+++ b/src/version.lisp
@@ -33,4 +33,4 @@
 
 (in-package :version)
 
-(defparameter *version* #.(concatenate 'string "Version: 1209.2   built " (date-string)))
+(defparameter *version* #.(concatenate 'string "Version: 13??   built " (date-string)))