Fixed NullPointerExceptions for getCanonicalName() calls
Merge branch 'PreRelease'

* PreRelease:
  Fixed a lot of the item based properties not working at all