Fixed possible null exception#589

imperugo wants to merge 2 commits intoFarfetch:masterFarfetch/kafkaflow:masterfrom

imperugo:masterimperugo/kafkaflow:masterCopy head branch name to clipboard