--- a/windowing/windowserver/nga/SERVER/scrdev.cpp	Tue Aug 31 16:31:06 2010 +0300
+++ b/windowing/windowserver/nga/SERVER/scrdev.cpp	Wed Sep 01 12:39:21 2010 +0100
@@ -33,7 +33,7 @@
 #include <graphics/wsdisplaycontrol.h>
 #include "wsdisplaychangeao.h"
 #include <graphics/wstestscreencapture.h>
-#include <graphics/WSGRAPHICDRAWERINTERFACE.H>
+#include <Graphics/WSGRAPHICDRAWERINTERFACE.H>
 
 const TInt KEikSrvsSid=0x10003a4a;
 
@@ -46,6 +46,7 @@
 		,iClientScreenDevicePointer(aClientScreenDevicePointer)
 	{
 	MWsScreen* pOI=Screen();
+	WS_ASSERT_ALWAYS(pOI, EWsPanicNoScreen);
 	iDispCont=pOI->ObjectInterface<MWsDisplayControl>();
 	iDispMap =pOI->ObjectInterface<MWsDisplayMapping>();
 	iTestScreenCapture = pOI->ObjectInterface<MWsTestScreenCapture>();