Added basic property checks.