BAZYNGO-1639: null pointer exception fix.