diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc
index 33c47ad7..1ba67460 100644
--- a/Dllmain/BuildNo.rc
+++ b/Dllmain/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 6794 
+#define BUILD_NUMBER 6795 
diff --git a/ddraw/IDirectDrawSurfaceX.cpp b/ddraw/IDirectDrawSurfaceX.cpp
index afddf7c7..fd743eef 100644
--- a/ddraw/IDirectDrawSurfaceX.cpp
+++ b/ddraw/IDirectDrawSurfaceX.cpp
@@ -3423,6 +3423,10 @@ inline LPDIRECT3DTEXTURE9 m_IDirectDrawSurfaceX::GetD3D9Texture()
 	// Primary display texture
 	if (PrimaryDisplayTexture)
 	{
+		if (IsPrimarySurface() && surface.IsUsingWindowedMode && IsPalette() && (surface.DisplayTexture || !primary.PaletteTexture))
+		{
+			Logging::Log() << __FUNCTION__ << " Error: using non-shader palette surface on window mode not supported!";
+		}
 		return PrimaryDisplayTexture;
 	}