2ed4037901
Merge commit '8316e875baee53b661d5af8fa843d97e51acbcf6' into kraken * commit '8316e875baee53b661d5af8fa843d97e51acbcf6': Fix null pointer exception