fix exception was not found, maybe merge fail