added more nullptr checks

5 jobs for !1 with rsmpbs in 4 minutes and 40 seconds (queued for 2 seconds)
merge request