avoid triggering issue 13745 in further improvements to come
Merge pull request #2737 from 9il/exc

avoid triggering issue 13745 in further improvements to come