diff --git a/contents/code/tilelist.js b/contents/code/tilelist.js
index 35dee9027ee98e30737f174df013afec137c2f45..5108e96e57a60687a4a46b6e187779133a20bf91 100644
--- a/contents/code/tilelist.js
+++ b/contents/code/tilelist.js
@@ -107,12 +107,26 @@ TileList.prototype.addClient = function(client) {
 		getTile(client).onClientDesktopChanged(client);
 	});
 	client.clientMinimized.connect(function(client) {
-		self._onClientRemoved(client);
-		getTile(client).onClientMinimizedChanged(client);
+		try {
+			self._onClientRemoved(client);
+			var tile = getTile(client);
+			if (tile != null) {
+				tile.onClientMinimizedChanged(client);
+			}
+		} catch(err) {
+			print(err, "in mimimized");
+		}
 	});
 	client.clientUnminimized.connect(function(client) {
-		self._onClientAdded(client);
-		getTile(client).onClientMinimizedChanged(client);
+		try {
+			self._onClientAdded(client);
+			var tile = getTile(client);
+			if (tile != null) {
+				tile.onClientMinimizedChanged(client);
+			}
+		} catch(err) {
+			print(err, "in Unminimized");
+		}
 	});
 
 	// Check whether the client is part of an existing tile
@@ -139,6 +153,7 @@ TileList.prototype.addClient = function(client) {
 		client.keepBelow = true;
 	}
 	client.tiling_floating = false;
+	assert(client.tiling_tileIndex >= 0, "Client added with invalid tileIndex");
 };
 
 TileList.prototype.retile = function() {
diff --git a/metadata.desktop b/metadata.desktop
index 68bd2415cd5fe452a18e4975a284c1fb13b89cef..4450b23bd2bbf68c772f414b0899d3b426e2fc07 100644
--- a/metadata.desktop
+++ b/metadata.desktop
@@ -11,7 +11,7 @@ X-KDE-PluginInfo-Email=FHomborg@gmail.com
 X-KDE-PluginInfo-Name=kwin-script-tiling
 X-KDE-PluginKeyword=kwin-script-tiling
 X-KDE-ParentComponents=kwin-script-tiling
-X-KDE-PluginInfo-Version=1.0.1
+X-KDE-PluginInfo-Version=1.1.0
 
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL