Fix #583. Squash errors with prop protection.