Remove exception checking in hotfix.