Take into account extra case

Bug 105
Also handle case of ending turn without a selected unit