Modify some code, but now exeption threw...
Merged.