Fix NPE for SCI-1974