Fixed notices if no data is available

Change-Id: I6bf799493c87c8b01bb79b1a6954423ce5680c88
Merge "Fixed notices if no data is available"