Fixing incorrect merge for new error handling code