Fixed null pointer exception; not all instances will include merge agent