Merge "prevent dead-lock by removing mutex lock in errorHandlerProc"