Fixed a couple NullPointerExceptions in the property view.