Colin's and my fixes to connection_fatal().