Added a nil check
Merge branch 'master' of github.com:michaelkamprath/iPhoneMK