diff --git a/koGrid-2.1.1.debug.js b/koGrid-2.1.1.debug.js
index 32a16b38..afcc7e5c 100644
--- a/koGrid-2.1.1.debug.js
+++ b/koGrid-2.1.1.debug.js
@@ -2123,9 +2123,9 @@ window.kg.sortService = {
             // we want to force nulls and such to the bottom when we sort... which effectively is "greater than"
             if (!propB && !propA) {
                 return 0;
-            } else if (!propA) {
+            } else if (!propA && (propA === undefined || propA === null)) {
                 return 1;
-            } else if (!propB) {
+            } else if (!propB && (propB === undefined || propA === null)) {
                 return -1;
             }
             //made it this far, we don't have to worry about null & undefined
diff --git a/koGrid-2.1.1.js b/koGrid-2.1.1.js
index a4337943..b1b48f85 100644
--- a/koGrid-2.1.1.js
+++ b/koGrid-2.1.1.js
@@ -137,7 +137,7 @@ if(dateA<dateB){return-1;}
 return 1;},sortData:function(data,sortInfo){var unwrappedData=data();if(!unwrappedData||!sortInfo){return;}
 var col=sortInfo.column,direction=sortInfo.direction,sortFn,item;if(window.kg.sortService.colSortFnCache[col.field]){sortFn=window.kg.sortService.colSortFnCache[col.field];}else if(col.sortingAlgorithm!=undefined){sortFn=col.sortingAlgorithm;window.kg.sortService.colSortFnCache[col.field]=col.sortingAlgorithm;}else{item=unwrappedData[0];if(!item){return;}
 sortFn=kg.sortService.guessSortFn(item[col.field]);if(sortFn){window.kg.sortService.colSortFnCache[col.field]=sortFn;}else{sortFn=window.kg.sortService.sortAlpha;}}
-unwrappedData.sort(function(itemA,itemB){var propA=window.kg.utils.evalProperty(itemA,col.field);var propB=window.kg.utils.evalProperty(itemB,col.field);if(!propB&&!propA){return 0;}else if(!propA){return 1;}else if(!propB){return-1;}
+unwrappedData.sort(function(itemA,itemB){var propA=window.kg.utils.evalProperty(itemA,col.field);var propB=window.kg.utils.evalProperty(itemB,col.field);if(!propB&&!propA){return 0;}else if(!propA&&(propA===undefined||propA===null)){return 1;}else if(!propB&&(propB===undefined||propB===null)){return-1;}
 if(direction===ASC){return sortFn(propA,propB);}else{return 0-sortFn(propA,propB);}});data(unwrappedData);return;},Sort:function(sortInfo,data){if(window.kg.sortService.isSorting){return;}
 window.kg.sortService.isSorting=true;window.kg.sortService.sortData(data,sortInfo);window.kg.sortService.isSorting=false;}};var getWidths=function(){var $testContainer=$('<div></div>');$testContainer.appendTo('body');$testContainer.height(100).width(100).css("position","absolute").css("overflow","scroll");$testContainer.append('<div style="height: 400px; width: 400px;"></div>');window.kg.domUtilityService.ScrollH=($testContainer.height()-$testContainer[0].clientHeight);window.kg.domUtilityService.ScrollW=($testContainer.width()-$testContainer[0].clientWidth);$testContainer.empty();$testContainer.attr('style','');$testContainer.append('<span style="font-family: Verdana, Helvetica, Sans-Serif; font-size: 14px;"><strong>M</strong></span>');window.kg.domUtilityService.LetterW=$testContainer.children().first().width();$testContainer.remove();};window.kg.domUtilityService={AssignGridContainers:function(rootEl,grid){grid.$root=$(rootEl);grid.$topPanel=grid.$root.find(".kgTopPanel");grid.$groupPanel=grid.$root.find(".kgGroupPanel");grid.$headerContainer=grid.$topPanel.find(".kgHeaderContainer");grid.$headerScroller=grid.$topPanel.find(".kgHeaderScroller");grid.$headers=grid.$headerScroller.children();grid.$viewport=grid.$root.find(".kgViewport");grid.$canvas=grid.$viewport.find(".kgCanvas");grid.$footerPanel=grid.$root.find(".ngFooterPanel");window.kg.domUtilityService.UpdateGridLayout(grid);},UpdateGridLayout:function(grid){var scrollTop=grid.$viewport.scrollTop();grid.elementDims.rootMaxW=grid.$root.width();grid.elementDims.rootMaxH=grid.$root.height();grid.refreshDomSizes();grid.adjustScrollTop(scrollTop,true);},BuildStyles:function(grid){var rowHeight=grid.config.rowHeight,$style=grid.$styleSheet,gridId=grid.gridId,css,cols=grid.visibleColumns(),sumWidth=0;if(!$style){$style=$('#'+gridId);if(!$style[0]){$style=$("<style id='"+gridId+"' type='text/css' rel='stylesheet' />");$style.appendTo('body');}}
 $style.empty();var trw=grid.totalRowWidth();css="."+gridId+" .kgCanvas { width: "+trw+"px; }"+"."+gridId+" .kgRow { width: "+trw+"px; }"+"."+gridId+" .kgCell { height: "+rowHeight+"px; }"+"."+gridId+" .kgCanvas { width: "+trw+"px; }"+"."+gridId+" .kgHeaderCell { top: 0; bottom: 0; }"+"."+gridId+" .kgHeaderScroller { width: "+(trw+window.kg.domUtilityService.scrollH+2)+"px}";$.each(cols,function(i,col){css+="."+gridId+" .col"+i+" { width: "+col.width+"px; left: "+sumWidth+"px; right: "+(trw-sumWidth-col.width)+"px; height: "+rowHeight+"px }"+"."+gridId+" .colt"+i+" { width: "+col.width+"px; }";sumWidth+=col.width;});if(window.kg.utils.isIe){$style[0].styleSheet.cssText=css;}else{$style.append(document.createTextNode(css));}