I see what you're saying.  I'm not finding that notice, but adding the extra check would be safer.  I'll add it in.