Fixed NullPointerException in property view when the model is incomplete
plus a few other bugs.