Null ref on return from Contr Edit bug fix