Add extra checks