Adjusting order of and null handling for exception handling.