Simplified null checking