Even better defensive checking