Fixed extra issue of !facility.equals(null) to facility != null