Updated check options

Simplified and robustified the checking of the “check” argument.