diff --git a/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp b/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
index 2700da36f5..b6b0e315aa 100644
--- a/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
+++ b/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
@@ -175,6 +175,9 @@ MouseDevice::Start()
 void
 MouseDevice::Stop()
 {
+	close(fDevice);
+	fDevice = -1;
+
 	fActive = false;
 		// this will stop the thread as soon as it reads the next packet
 
@@ -186,8 +189,6 @@ MouseDevice::Stop()
 		status_t dummy;
 		wait_for_thread(fThread, &dummy);
 	}
-
-	close(fDevice);
 }
 
 
@@ -251,9 +252,9 @@ MouseDevice::_Run()
 		_ComputeAcceleration(movements, deltaX, deltaY);
 
 		LOG("%s: buttons: 0x%lx, x: %ld, y: %ld, clicks:%ld, wheel_x:%ld, wheel_y:%ld\n",
-			device->device_ref.name, movements.buttons, movements.xdelta, movements.ydelta,
+			fDeviceRef.name, movements.buttons, movements.xdelta, movements.ydelta,
 			movements.clicks, movements.wheel_xdelta, movements.wheel_ydelta);
-		LOG("%s: x: %ld, y: %ld\n", device->device_ref.name, deltaX, deltaY);
+		LOG("%s: x: %ld, y: %ld\n", fDeviceRef.name, deltaX, deltaY);
 
 		BMessage *message = NULL;
 
diff --git a/src/add-ons/input_server/devices/mouse/MouseInputDevice.h b/src/add-ons/input_server/devices/mouse/MouseInputDevice.h
index 18b77a9c99..0c8251f257 100644
--- a/src/add-ons/input_server/devices/mouse/MouseInputDevice.h
+++ b/src/add-ons/input_server/devices/mouse/MouseInputDevice.h
@@ -13,13 +13,15 @@
 #include <InterfaceDefs.h>
 #include <List.h>
 
+#include <stdio.h>
+
 
 class MouseDevice;
 
 class MouseInputDevice : public BInputServerDevice {
 	public:
 		MouseInputDevice();
-		~MouseInputDevice();
+		virtual ~MouseInputDevice();
 
 		virtual status_t InitCheck();