diff --git a/grepolis.user.js b/grepolis.user.js
index 12f296b..8263898 100644
--- a/grepolis.user.js
+++ b/grepolis.user.js
@@ -10,7 +10,7 @@
 //
 // @match			http://*.grepolis.com/game/*
 //
-// @version         1.0.30
+// @version         1.0.31
 // @updateURL		http://git.javil.eu/jan/userscripts/raw/master/grepolis.user.js
 // ==/UserScript==
 
@@ -64,13 +64,23 @@
 			}
 
 			var wnd = GPWindowMgr.getWindowById(windowId);
-			if(windowId == undefined){
+			if(wnd == undefined){
 				console.log("Window not open any more");
 				setTimeout(getWaresTick(xFarmId), 50);
 				return;
 			}
 
 			var wndElemend = wnd.getElement();
+			if(windowId == undefined){
+				console.log("Window not reachable any more");
+				try {
+					wnd.close();
+				} catch(e) {
+					console.warn("Could not close Window");
+				}
+				setTimeout(getWaresTick(xFarmId), 50);
+				return;
+			}
 			var btn = $(wndElement).find(".farm_claim_box .farm_claim_res0 + div + a");
 			var mood = parseFloat($(wndElement).find('#mood1').siblings().last().text());