Fixes for fail explanation and cli output on error