Fixed SCI-699 - NPE possibly caused by some timing issue