Update 'except' syntax for 2.6+