Better support for nil facts