Fix to JS-236 NPE
fixing resolve conflict from badly merged branches