Align error handling across classes