Fix up the rest of the error checks.