add few checks