Always trap proxy exceptions
Fixed last commit and added test