Refined the bug fix for adding text views to null rows