Fix bug in error_and_exit() caller

Along the way make flake happy.