diff --git a/src/rootmenu.c b/src/rootmenu.c
index 3eaad07a..2c94c384 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -420,8 +420,6 @@ wRootMenuPerformShortcut(XEvent *event)
     Shortcut *ptr;
     int modifiers;
     int done = 0;
-    Window dummy;
-    int foo;
 
     /* ignore CapsLock */
     modifiers = event->xkey.state & ValidModMask;
diff --git a/src/screen.c b/src/screen.c
index 5e848a04..a17915dc 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1028,8 +1028,6 @@ wScreenRestoreState(WScreen *scr)
     scr->session_state = WMReadPropListFromFile(path);
     wfree(path);
     if (!scr->session_state && wScreenCount>1) {
-	/*char buf[16];
-	snprintf(buf, sizeof(buf), "WMState.%i", scr->screen);*/
 	path = wdefaultspathfordomain("WMState");
 	scr->session_state = WMReadPropListFromFile(path);
 	wfree(path);
@@ -1049,7 +1047,7 @@ wScreenRestoreState(WScreen *scr)
         wWorkspaceManageEdge(scr);
 #endif
 
-    if (!wPreferences.flags.nodock) {
+    if (!wPreferences.flags.nodock && scr->session_state) {
         state = WMGetFromPLDictionary(scr->session_state, dDock);
         scr->dock = wDockRestoreState(scr, state, WM_DOCK);
     }