NullPointerException fix
upd