aaa: fix misc null pointer exceptions

Topic: AAA
Change-Id: Ifcd2c3c8dcc0989951d6274bb3d75d7f93c8c728
Signed-off-by: Alon Bar-Lev <alonbl@redhat.com>