RF-13647: fix NPE in RF-13018