Fixed throw bug