Added conditional checks.
Updated CHANGELOG.md