Required change for custom error handler feature