Fix NPE that can occur with JABBA dolly integration
Merge branch 'master' of https://github.com/jaquadro/StorageDrawers