Fixed a bug with null pointers.
Merge branch 'master' of https://github.com/Whirligig231/boilermake2014