Bugfix: used old exception handling syntax which broke in 3.3.