Additional error checking