Check for multiple exception types #859

Check for multiple exception types #859 #1251