Throw an exception for unsupported property names
Code tidyup