Check for null, not just falsy. Refs #298