Fix TypeError in componentWillReceiveProps

Added test case to cover this code path. Ran into separate property
update issue.