extra defensive check
closes GH-255