Another SCT system test + a NPE fix