diff --git a/src/com/limelight/computers/ComputerManagerService.java b/src/com/limelight/computers/ComputerManagerService.java
index b9c6702b..c7e309a7 100644
--- a/src/com/limelight/computers/ComputerManagerService.java
+++ b/src/com/limelight/computers/ComputerManagerService.java
@@ -48,12 +48,13 @@ public class ComputerManagerService extends Service {
 	private ServiceConnection discoveryServiceConnection = new ServiceConnection() {
 		public void onServiceConnected(ComponentName className, IBinder binder) {
 			synchronized (discoveryServiceConnection) {
-				discoveryBinder = ((DiscoveryService.DiscoveryBinder)binder);
+				DiscoveryService.DiscoveryBinder privateBinder = ((DiscoveryService.DiscoveryBinder)binder);
 				
 				// Set us as the event listener
-				discoveryBinder.setListener(createDiscoveryListener());
+				privateBinder.setListener(createDiscoveryListener());
 				
 				// Signal a possible waiter that we're all setup
+				discoveryBinder = privateBinder;
 				discoveryServiceConnection.notifyAll();
 			}
 		}