When last row in section of UITableView with Core Data is moved -> NSRangeException

Question

Hi: Moving rows between sections in Core Data backed UITableView works quite fine after I've implemented a 'userDrivenChange' check in 'controllerDidChangeContent:', as mentioned in the apple docs. But only when moving the last row of a section to another section I get a NSRangeException. There is obviously a problem when sections get empty. How could I handle that the best way?