Added general exception

Change-Id: I4bd550350bb30e59cdcbb1a1c74dfb55977917c6