add a few checks