Added some checks to see if constants defined before comparing collections with them