Fixed exception handling, overwriten "equals" to use "contains" from List