Fixed a bunch of NPEs and bug #2271 and bug #2272
Merge pull request #79 from jb-aero/pullable

Fixed a bunch of NPEs and bug #2271 and bug #2272