Add nil? support