Fixes/Implements #204: Return non-zero error code on error