diff --git a/.travis/build.sh b/.travis/build.sh
index b49a453..44ff007 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -euo pipefail
+
 if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
     xcodebuild $ACTION -project Polyline.xcodeproj -scheme "$SCHEME" -destination "$DESTINATION" ONLY_ACTIVE_ARCH=NO
     swift build
diff --git a/Sources/Polyline/Polyline.swift b/Sources/Polyline/Polyline.swift
index f283e03..594d581 100644
--- a/Sources/Polyline/Polyline.swift
+++ b/Sources/Polyline/Polyline.swift
@@ -24,7 +24,7 @@ import Foundation
 #if canImport(CoreLocation)
 import CoreLocation
 #endif
-#if canImport(MapKit)
+#if canImport(MapKit) && !os(watchOS)
 import MapKit
 #endif
 
@@ -61,7 +61,7 @@ public struct Polyline {
     }
     #endif
     
-    #if canImport(MapKit)
+    #if canImport(MapKit) && !os(watchOS)
     /// Convert polyline to MKPolyline to use with MapKit (nil if polyline cannot be decoded)
     @available(tvOS 9.2, *)
     public var mkPolyline: MKPolyline? {