Add NPE check to DragSortController