Bug-1307 - unit test failing (NPE)

Change-Id: I9f1714fc9a7c4e3de0b7e73927dda308ccaef062
Signed-off-by: Martin Bobak <mbobak@cisco.com>