Merge "Fix text extraction where we don't have proper file handler"