checked for nil return when row focussed row no longer visible
minor refac