diff --git a/common/src/js/webdriver/web_element.js b/common/src/js/webdriver/web_element.js
index f31ae2a..5f29877 100644
--- a/common/src/js/webdriver/web_element.js
+++ b/common/src/js/webdriver/web_element.js
@@ -114,6 +114,7 @@ webdriver.element.getAttribute = function(element, attribute) {

   if (bot.dom.hasProperty(element, attribute)) {
     value = bot.dom.getProperty(element, attribute);
+    value = goog.string.isEmpty(value) ? null : value;
   }

   if (!goog.isDef(value) && bot.dom.hasAttribute(element, attribute)) {
diff --git a/common/test/js/webdriver/web_element_test.html b/common/test/js/webdriver/web_element_test.html
index 332297c..30b9b9b 100644
--- a/common/test/js/webdriver/web_element_test.html
+++ b/common/test/js/webdriver/web_element_test.html
@@ -57,6 +57,12 @@ limitations under the License.
       assertNull(webdriver.element.getAttribute(element, 'readonly'));
     }

+	function testShouldReturnMissingAttributesAsNull() {
+	  var element = bot.locators.findElement({id: 'selected-option'});
+
+	  assertNull(webdriver.element.getAttribute(element, 'label'));
+	}
+
     function testSettingAnyValueForABooleanAttributeSetsItToTrue() {
       var element = bot.locators.findElement({id: 'bad-ro'});