Improve error handling

Signed-off-by: John Else <john.else@citrix.com>