Merge "Added check for nullpointer exception"