Fixup exception handling for capabilities