Changed throw error issue.