Fix for edit of edit null reference