Merge "Fix missing "raise" before cls.skipException"