Return status code instead of detailes

Change-Id: Id0fe5dcae7ae19dee455a7ae8928e4a0d55fca26