Bustage fix for bug 851270: don't use Python 2.7 specific syntax for exception catching. r=bustage