Removing the exceptions? I think you've got a messy merge going on here.