fix shutdown npe

1 job for !21 with gcp-gsm in 6 minutes and 50 seconds (queued for 5 seconds)
latest merge request