Fix a few more bugs with the parser (null properties, etc)