Improve error messages

Signed-off-by: Jon O'Donnell <jodonnell@nuvotechnologies.com>