Corrected error from merge to re-fix server crash on skill queue empty.