Merge "Add fatal error check"