EMBRYO-38: corrected bug: NullPointerException