Fix infinite loop on error throwns :)