catch null values

3 jobs for master in 6 minutes and 35 seconds