Merge pull request #1097 from laanwj/2012_04_runawayexception