Adding defensive checks.