diff --git a/build.gradle b/build.gradle
index a3026de30d..fd870b3ad6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,6 +23,7 @@ buildscript {
         commonscodec_version = '1.15'
         jodatime_version = '2.10.10'
         work_version = '2.5.0'
+        tink_version = '1.5.0'
 
         junit_version = '4.13.2'
         mockitoVersion = '3.7.7'
diff --git a/core/core_dependencies.gradle b/core/core_dependencies.gradle
index 25ecf5b36c..e5f68665f6 100644
--- a/core/core_dependencies.gradle
+++ b/core/core_dependencies.gradle
@@ -46,7 +46,7 @@ dependencies {
 
     //CryptoUtil
     api 'com.madgag.spongycastle:core:1.58.0.0'
-
+    api "com.google.crypto.tink:tink-android:$tink_version"
 
     // Graphview cannot be upgraded
     api "com.jjoe64:graphview:4.0.1"
diff --git a/omnipod-dash/build.gradle b/omnipod-dash/build.gradle
index 34ca4406c5..bf7d1c99c1 100644
--- a/omnipod-dash/build.gradle
+++ b/omnipod-dash/build.gradle
@@ -22,5 +22,4 @@ dependencies {
     implementation "androidx.room:room-rxjava2:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
     implementation 'com.github.guepardoapps:kulid:1.1.2.0'
-    implementation 'com.google.crypto.tink:tink-android:1.5.0'
 }
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/MessageIOException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/MessageIOException.kt
index 30cbac205b..5645cb009b 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/MessageIOException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/MessageIOException.kt
@@ -2,5 +2,5 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.excepti
 
 class MessageIOException : Exception {
     constructor(msg: String) : super(msg)
-    constructor(cause: Throwable) : super(cause)
+    constructor(cause: Throwable) : super("Caught Exception during Message I/O", cause)
 }
\ No newline at end of file
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt
index e844cc48ab..343e82cd52 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt
@@ -2,5 +2,5 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message
 
 import info.nightscout.androidaps.utils.extensions.toHex
 
-class CrcMismatchException(val expected: Long, val got: Long, val payload: ByteArray) :
-    Exception("CRC missmatch. Got: ${got}. Expected: ${expected}. Payload: ${payload.toHex()}")
\ No newline at end of file
+class CrcMismatchException(val expected: Long, val actual: Long, val payload: ByteArray) :
+    Exception("CRC mismatch. Actual: ${actual}. Expected: ${expected}. Payload: ${payload.toHex()}")
\ No newline at end of file
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairResult.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairResult.kt
index c2bdb921ef..f542e1169d 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairResult.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairResult.kt
@@ -1,7 +1,9 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair
 
+import info.nightscout.androidaps.utils.extensions.toHex
+
 data class PairResult(val ltk: ByteArray) {
     init {
-        require(ltk.size == 16)
+        require(ltk.size == 16) {"LTK length must be 16 bytes. Received LTK: ${ltk.toHex()}"}
     }
 }