Npe fixes

First-attempts to remove all of the Null Pointer Exceptions,