Database: FailOnErrorHandler added