Clean error message display :)

Change-Id: Ie74e590c7d9c9de0b5a22ca5185c3cd5438a50cb