* Code refactor * Handle exception * Provide useful error message to user when exception is raised Fixes: #1504 Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>