Adding a little more guard with assert