Added null check in MakerBase
Merge branch 'master' of git@github.com:barchart/barchart-feed.git