diff --git a/Gettext/Entries.php b/Gettext/Entries.php
index <HASH>..<HASH> 100644
--- a/Gettext/Entries.php
+++ b/Gettext/Entries.php
@@ -37,7 +37,7 @@ class Entries extends \ArrayObject {
 			$original = $original->getOriginal();

 			$plural = $original->getPlural();

 		} else {

-			$context = (string)$context;

+			$context = ($context === null) ? null : (string)$context;

 			$original = (string)$original;

 			$plural = (string)$plural;

 		}

diff --git a/Gettext/Translation.php b/Gettext/Translation.php
index <HASH>..<HASH> 100644
--- a/Gettext/Translation.php
+++ b/Gettext/Translation.php
@@ -101,7 +101,9 @@ class Translation {
 	public function hasReferences () {

 		return isset($this->references[0]);

 	}

-

+    public function wipeReferences () {

+    	$this->references = array();

+    }

 	public function getReferences () {

 		return $this->references;

 	}
Bugfix: do not compare context if set to null. Added method: wipeReferences to Translation.php