Cleanups for FormatChecker error catching