Don't allow bad property types through.
Merge bug26140
stable to default