still fucking around
Merge branch 'master' of https://github.com/omnivescence/hw04
added some NULL pointer error handling