Fix NPE on reading data

When reading data if a null value is returned return Optional.absent();

Change-Id: I2d6a3a8001492c8c4c50a779b2770c72a9953494
Signed-off-by: Moiz Raja <moraja@cisco.com>
Merge "Fix NPE on reading data"