Few more checks here and there.