I think I finally tracked down the weird null catalog handles in TestMarkovConflictChecker. I think it was a race condition on CatalogMap.values()