Added null checks
Renamed server type job
Moved initialisation of classifier to mapper setup