Improve handling of unknown properties

Related to #710