Changed exception handling in supersetup