1.6: Fix in error handling code