diff --git a/lib/src/aad_calls.dart b/lib/src/aad_calls.dart
index 8387f17..037931d 100644
--- a/lib/src/aad_calls.dart
+++ b/lib/src/aad_calls.dart
@@ -188,7 +188,7 @@ class FlutterAAD {
     }
 
     var rtoken = refresh_token;
-    if (tok == null || tok == "") {
+    if (rtoken == null || rtoken == "") {
       rtoken = this.currentRefreshToken;
       if (rtoken == "") {
         if (onError != null) {
diff --git a/test/flutter_aad_test.dart b/test/flutter_aad_test.dart
index 79d4619..08d1209 100644
--- a/test/flutter_aad_test.dart
+++ b/test/flutter_aad_test.dart
@@ -202,6 +202,24 @@ void main() {
 
     expect((await aad_logged_out.GetListItems("https://test.site", "Title")),
         null); //can't refresh if not logged in
+    expect(
+        (await aad_logged_out.GetListItems("https://test.site", "Title",
+            onError: (msg) {
+          expect(msg, "No access token passed and saved full token is empty.");
+        })),
+        null);
+    expect(
+        (await aad_logged_out.GetListItems("https://test.site", "Title",
+            token: "token", onError: (msg) {
+          expect(msg, "No refresh token passed and saved full token is empty.");
+        })),
+        null);
+    expect(
+        (await aad_logged_out.GetListItems("https://test.site", "Title",
+            token: "bad_token", refresh_token: "bad_token", onError: (msg) {
+          expect(msg, "bad client id");
+        })),
+        null);
     expect(
         (await aad.GetListItems(
           "https://test.site",