IDEX-1630: fix NPE in FF