Tidy up of the exit status based on the issues founf during startup.

See Bugzilla 370.