Custom check no longer blows up. Fixes #264