Add NULL_TRAP as a config option