Added several checks.