(bug-fix:minor) Fixed exception re-throwing.