--- mcore-src/trunk/mcore-tools/daemon/client/include/input.client.class	2013/05/08 12:22:16	2058
+++ mcore-src/trunk/mcore-tools/daemon/client/include/input.client.class	2013/05/08 12:39:51	2059
@@ -49,7 +49,7 @@
 get_input_keymap()
 {
 	local keymap
-	if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
+	if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]] && pidof X &> /dev/null
 	then
 		keymap=$(x11runas "setxkbmap -query" | grep layout | awk '{print $2}')
 	else