Make things a little more robust