Fix typo
Specified missing exception
Merge branch 'v1.2'