remove exception - this has to become a event that should be triggered