Preparation for FishEvent and better Error Messages