diff --git a/WiiUseJ/WiiUseJ.dll b/WiiUseJ/WiiUseJ.dll
index 384c829..823a419 100644
Binary files a/WiiUseJ/WiiUseJ.dll and b/WiiUseJ/WiiUseJ.dll differ
diff --git a/WiiUseJ/src/wiiusej/WiiUseApiManager.java b/WiiUseJ/src/wiiusej/WiiUseApiManager.java
index 6f938b7..bea28df 100644
--- a/WiiUseJ/src/wiiusej/WiiUseApiManager.java
+++ b/WiiUseJ/src/wiiusej/WiiUseApiManager.java
@@ -52,7 +52,7 @@ public class WiiUseApiManager extends Thread {
 	public static int WIIUSE_STACK_MS = 1;
 	public static int WIIUSE_STACK_BLUESOLEIL = 2;
 
-	private static WiiUseApiManager getInstance() {
+	public static WiiUseApiManager getInstance() {
 		return instance;
 	}
 
@@ -211,7 +211,7 @@ public class WiiUseApiManager extends Thread {
 		int index = 0;
 		boolean found = false;
 		while (index < wiimotes.length && !found) {
-			if (wiimotes[index].getId() == id) {// we have a wiimote with this
+			if (wiimotes[index]!=null && wiimotes[index].getId() == id) {// we have a wiimote with this
 				// id
 				// remove the wiimote
 				removeWiiUseApiListener(wiimotes[index]);