Making things a little more robust.