Merge pull request #2879 from janvorli/fix-exception-in-prestub-using-holder-pass1