MOB-2772 added nullcheck