1 files changed, 5 insertions, 4 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index 2f8f6ec..6fa97d5 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -88,7 +88,7 @@ type UsageTag = String
 type Initializer = String
 type PassWordFile = InputFile
 
-data FileType = KeyRingFile PassWordFile
+data FileType = KeyRingFile (Maybe PassWordFile)
               | PEMFile UsageTag
               | WalletFile -- (Maybe UsageTag)
 
@@ -101,7 +101,7 @@ isring (KeyRingFile {}) = True
 isring _                = False
 
 pwfile (KeyRingFile f) = f
-pwfile _               = HomeSec
+pwfile _               = Nothing
 
 iswallet (WalletFile {}) = True
 iswallet _               = False
@@ -279,6 +279,7 @@ data KikiReportAction =
         | ExternallyGeneratedFile
         | UnableToExport KeyAlgorithm String
         | FailedFileWrite
+ deriving Show
 
 data KikiResult a = KikiResult
     { kikiCondition :: KikiCondition a
@@ -1173,9 +1174,9 @@ runKeyRing keyring = do
             -- TODO: head will throw an exception if a File Descriptor keyring
             -- file is present.  We probably should change OriginMap to use InputFile
             -- instead of FilePath.
-            Traversable.mapM (cachedContents secring pubring . pwfile . snd)
+            Traversable.mapM (cachedContents secring pubring . fromJust . pwfile . snd)
                              (Map.mapKeys (head . resolveInputFile secring pubring)
-                                $ Map.filter (isring . snd) $ kFiles keyring)
+                                $ Map.filter (isJust . pwfile . snd) $ kFiles keyring)
 
         unkeysRef <- newIORef Map.empty