throw() related bug fix