More error handling changes
effect class