Fix error handling for selected zone