Fix NPE on embed steps