Remove call to last and use lastOption on collection.

NET-A-PORTER · Jan 8, 2017 · 78b3beb · 78b3beb
1 parent 64d5492
commit 78b3beb
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/scala/com/netaporter/uri/Uri.scala b/src/main/scala/com/netaporter/uri/Uri.scala
@@ -33,9 +33,13 @@ case class Uri (
     pathPartOption(name).head
 
   def matrixParams =
-    pathParts.last match {
-      case MatrixParams(_, p) => p
-      case _ => Seq.empty
+    pathParts.lastOption match {
+      case Some(pathPart) =>
+        pathPart match {
+          case MatrixParams(_, p) => p
+          case _ => Seq.empty
+        }
+      case None => Seq.empty
     }
 
   def addMatrixParam(pp: String, k: String, v: String) = copy (