fix: return nil instead of error directly (#6298)

fix: return nil instead of error directly (#6298) #6251