--- entity_token.tokens.inc.old	2013-02-14 18:24:47.029042694 +0300
+++ entity_token.tokens.inc	2013-02-14 18:25:06.739074168 +0300
@@ -294,7 +294,7 @@
  */
 function _entity_token_get_token($wrapper, $options) {
 
-  if ($wrapper->value() === NULL) {
+  if ((!$wrapper) || ($wrapper->value() === NULL)) {
     // Do not provide a replacement if there is no value.
     return NULL;
   }