NPE bugfix

1 job for master in 39 seconds (queued for 7 seconds)