diff --git a/grepolis.user.js b/grepolis.user.js
index c3a2b4e..6914b58 100644
--- a/grepolis.user.js
+++ b/grepolis.user.js
@@ -10,7 +10,7 @@
 //
 // @match			http://*.grepolis.com/game/*
 //
-// @version         1.0.32
+// @version         1.0.33
 // @updateURL		http://git.javil.eu/jan/userscripts/raw/master/grepolis.user.js
 // ==/UserScript==
 
@@ -65,13 +65,15 @@
 
 			var wnd = GPWindowMgr.getWindowById(windowId);
 			if(wnd == undefined){
+				windows[xFarmId] = undefined;
 				console.log("Window not open any more");
 				setTimeout(getWaresTick(xFarmId), 50);
 				return;
 			}
 
 			var wndElement = wnd.getElement();
-			if(windowId == undefined){
+			if(wndElement == undefined){
+				windows[xFarmId] = undefined;
 				console.log("Window not reachable any more");
 				try {
 					wnd.close();