Exception handling python 2.5 style
Merge branch '10.5-fix'