Added notification in case of null data received. Minor refactoring.