diff --git a/Tests/UriImmutableTest.php b/Tests/UriImmutableTest.php
index 8474ce8a..af87e82a 100644
--- a/Tests/UriImmutableTest.php
+++ b/Tests/UriImmutableTest.php
@@ -14,7 +14,7 @@
  *
  * @since  1.0
  */
-class UriImmuteableTest extends TestCase
+class UriImmutableTest extends TestCase
 {
 	/**
 	 * Object under test
diff --git a/src/AbstractUri.php b/src/AbstractUri.php
index 0d5d0fe1..6a6425b1 100644
--- a/src/AbstractUri.php
+++ b/src/AbstractUri.php
@@ -360,7 +360,7 @@ protected function parse($uri)
 		$retval = ($parts) ? true : false;
 
 		// We need to replace & with & for parse_str to work right...
-		if (isset($parts['query']) && strpos($parts['query'], '&'))
+		if (isset($parts['query']) && strpos($parts['query'], '&') !== false)
 		{
 			$parts['query'] = str_replace('&', '&', $parts['query']);
 		}