Adding internalError event support