am 4e3572b5: am 1cd92393: Null check for irk entry

* commit '4e3572b5f7a2abb6bb37fa1f50505f41dca13938':