Merge "Fix HiddenErrorHandler"