Improve #214: prevent errors in certain cases when false is returned