BUG-753: Fixed NPE and updated logging.

Change-Id: I9c2aaa2e35dad85ceccdeeb0a2fec704538ab43c
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>