From 4b4e8b5d670a176af38a9e98dc1c0920326c5880 Mon Sep 17 00:00:00 2001
From: Chris Jackson <chris@cd-jackson.com>
Date: Mon, 25 May 2015 18:43:53 +0100
Subject: [PATCH] Protect against empty selection causing exception when
 getting placeholder

---
 src/uiSelectController.js        | 2 +-
 src/uiSelectMultipleDirective.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/uiSelectController.js b/src/uiSelectController.js
index 9fe273ac2..f8633a0d7 100644
--- a/src/uiSelectController.js
+++ b/src/uiSelectController.js
@@ -125,7 +125,7 @@ uis.controller('uiSelectCtrl',
       data = data || ctrl.parserResult.source($scope);
       var selectedItems = ctrl.selected;
       //TODO should implement for single mode removeSelected
-      if ((angular.isArray(selectedItems) && !selectedItems.length) || !ctrl.removeSelected) {
+      if (ctrl.isEmpty() || (angular.isArray(selectedItems) && !selectedItems.length) || !ctrl.removeSelected) {
         ctrl.setItemsFn(data);
       }else{
         if ( data !== undefined ) {
diff --git a/src/uiSelectMultipleDirective.js b/src/uiSelectMultipleDirective.js
index b1e997ec5..141470747 100644
--- a/src/uiSelectMultipleDirective.js
+++ b/src/uiSelectMultipleDirective.js
@@ -56,7 +56,7 @@ uis.directive('uiSelectMultiple', ['uiSelectMinErr','$timeout', function(uiSelec
 
       ctrl.getPlaceholder = function(){
         //Refactor single?
-        if($select.selected.length) return;
+        if($select.selected && $select.selected.length) return;
         return $select.placeholder;
       };