MOB-2403 comments removed, added null check