Every block you changed needs to check for nil job.  How about standardizing that check?