Tightened a safety check so it can't be quietly bypassed

By Daniel R. Odio

See the code →