Clean up error / debug messages
Ensure we exit 0 when rcode=1