Adding in handling for generic row errors