Improve error handling in the UI

Change-Id: I1cd8aa53d1f54be3f0571152b3f803ac01478f5d
Signed-off-by: Iliyan Velichkov <iliyan.velichkov@sap.com>