Merge "Context isn't good enough, actually check for null"