Various small improvements to error handling and usability

Signed-off-by: Oren Leiman <oleiman@neutral.io>