Updated Exception

This will shows the right exception to client