EMBRYO-326: Fixed NullPointerException