Add some (hopefully) unnecessary checks