--- a/usbengines/usbotgwatcher/src/cusbstate.cpp	Tue Feb 02 00:52:37 2010 +0200
+++ b/usbengines/usbotgwatcher/src/cusbstate.cpp	Fri Feb 19 23:50:32 2010 +0200
@@ -66,7 +66,8 @@
 //
 TUsbStateIds CUsbState::Id()
     {
-    return EUsbStateUndefined;
+    Panic(EIdForNotDefinedStateRequested);
+    return EUsbStateHostUndefined;
     }
 
 // ---------------------------------------------------------------------------
@@ -111,6 +112,17 @@
 // 
 // ---------------------------------------------------------------------------
 //
+void CUsbState::HandleL(TInt aWhat, TUsbStateIds aWhereToHandle)
+    {
+    FTRACE( FPrint(_L( "[USBOTGWATCHER]\tCUsbState::HandleL aWhat = %d aWhere = %d" ), aWhat, aWhereToHandle));
+
+    iWatcher->HandleHostProblemL(aWhat, aWhereToHandle);
+    }
+
+// ---------------------------------------------------------------------------
+// 
+// ---------------------------------------------------------------------------
+//
 void CUsbState::SetPersonalityL()
     {
     }
@@ -188,6 +200,7 @@
 void CUsbState::VBusUpL()
     {
         FLOG( _L( "[USBOTGWATCHER]\tCUsbState::VBusUpL" ) );
+        Panic(EVBusUpNotExpected);
     }
 
 // From OTG state observer