diff --git a/AnkiConnect.py b/AnkiConnect.py
index 3ede0e5..f57c93b 100644
--- a/AnkiConnect.py
+++ b/AnkiConnect.py
@@ -360,6 +360,14 @@ class AnkiConnect:
             return collection
 
 
+    def decks(self):
+        decks = self.collection().decks
+        if decks is None:
+            raise Exception('decks are not available')
+        else:
+            return decks
+
+
     def scheduler(self):
         scheduler = self.collection().sched
         if scheduler is None:
@@ -472,7 +480,7 @@ class AnkiConnect:
 
     @api()
     def deckNames(self):
-        return self.collection().decks.allNames()
+        return self.decks().allnames()
 
 
     @api()
diff --git a/tests/test_decks.py b/tests/test_decks.py
new file mode 100755
index 0000000..8bfc0da
--- /dev/null
+++ b/tests/test_decks.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+
+import unittest
+import util
+
+
+class TestDeckNames(unittest.TestCase):
+    def runTest(self):
+        result = util.invoke('deckNames')
+        self.assertIn('Default', result)
+
+
+class TestDeckNamesAndIds(unittest.TestCase):
+    def runTest(self):
+        result = util.invoke('deckNamesAndIds')
+        self.assertIn('Default', result)
+        self.assertEqual(result['Default'], 1)
+
+
+if __name__ == '__main__':
+    unittest.main()