diff --git a/src/servers/app/BitmapManager.cpp b/src/servers/app/BitmapManager.cpp
index 7c1f2dbae4..16771c0eaf 100644
--- a/src/servers/app/BitmapManager.cpp
+++ b/src/servers/app/BitmapManager.cpp
@@ -127,7 +127,6 @@ BitmapManager::CreateBitmap(ClientMemoryAllocator* allocator,
 		Overlay* overlay = new (std::nothrow) Overlay(hwInterface, bitmap,
 			overlayToken);
 
-		const overlay_buffer* overlayBuffer = NULL;
 		overlay_client_data* clientData = NULL;
 		bool newArea = false;
 
@@ -144,7 +143,7 @@ BitmapManager::CreateBitmap(ClientMemoryAllocator* allocator,
 			bitmap->fAllocator = allocator;
 			bitmap->fAllocationCookie = cookie;
 			bitmap->SetOverlay(overlay);
-			bitmap->fBytesPerRow = overlayBuffer->bytes_per_row;
+			bitmap->fBytesPerRow = overlay->OverlayBuffer()->bytes_per_row;
 
 			buffer = (uint8*)overlay->OverlayBuffer()->buffer;
 			if (_allocationFlags)
diff --git a/src/servers/app/drawing/Overlay.cpp b/src/servers/app/drawing/Overlay.cpp
index 5159216a27..b191ba20b6 100644
--- a/src/servers/app/drawing/Overlay.cpp
+++ b/src/servers/app/drawing/Overlay.cpp
@@ -59,7 +59,7 @@ Overlay::Overlay(HWInterface& interface, ServerBitmap* bitmap,
 	fHWInterface(interface),
 	fOverlayBuffer(NULL),
 	fClientData(NULL),
-	fOverlayToken(NULL)
+	fOverlayToken(token)
 {
 	fSemaphore = create_sem(1, "overlay lock");
 	fColor.SetColor(21, 16, 21, 16);