diff --git a/index.html b/index.html
index 4fd0ddc..32ee965 100644
--- a/index.html
+++ b/index.html
@@ -10,6 +10,8 @@
     <div id="game"></div>
     <button id="load">Load</button>
     <div id="output"></div>
+    <div id="ui">
+    </div>
     <script type="text/javascript" src="lib/crafty.js"></script>
     <script type="text/javascript" src="lib/jquery-1.11.1.min.js"></script>
     <script type="text/javascript" src="src/jsds_crafty.js"></script>
diff --git a/src/jsds_crafty.js b/src/jsds_crafty.js
index fad6d0c..5bed572 100644
--- a/src/jsds_crafty.js
+++ b/src/jsds_crafty.js
@@ -78,7 +78,13 @@
 			this.enableControl();
 		    };
 		    if(e.mouseButton === Crafty.mouseButtons.RIGHT) {
-			cur_sel.attack(player[this.id]);
+			if ( !cur_sel ) { return; };
+			if ( cur_sel == player[this.id])
+			{
+			}
+			else {
+			    cur_sel.attack(player[this.id]);
+			};
 		    };
 		});