Fix error handling code