ErrorHandling bug fixed