Merge "fixing NullPointException incase of db exception"