Exception handling change to work in python 2.6 and 3