Ensure removal of all exit commands, final error improvements