Fixed throw issue