Index: /CKEditor/trunk/_source/core/dom/range.js
===================================================================
--- /CKEditor/trunk/_source/core/dom/range.js	(revision 3227)
+++ /CKEditor/trunk/_source/core/dom/range.js	(revision 3228)
@@ -1101,5 +1101,5 @@
 						endNode = this.getTouchedEndNode();
 
-					if ( startNode.isBlockBoundary() )
+					if ( startNode.type == CKEDITOR.NODE_ELEMENT && startNode.isBlockBoundary() )
 					{
 						this.setStartAt( startNode, 
@@ -1126,8 +1126,8 @@
 					}
 
-					if ( endNode.isBlockBoundary() )
+					if ( endNode.type == CKEDITOR.NODE_ELEMENT && endNode.isBlockBoundary() )
 					{
 						this.setEndAt( endNode, 
-							CKEDITOR.dtd.$empty[ startNode.getName() ] ?
+							CKEDITOR.dtd.$empty[ endNode.getName() ] ?
 								CKEDITOR.POSITION_BEFORE_START :
 								CKEDITOR.POSITION_BEFORE_END );
