diff --git a/src/tomb b/src/tomb
index 77c025a..e85a3cc 100755
--- a/src/tomb
+++ b/src/tomb
@@ -311,9 +311,15 @@ create_tomb() {
     tombfile=${tombname}.tomb
 
     if [ -e ${tombdir}/${tombfile} ]; then
-	error "tomb exists already. I'm not digging here:"
-	ls -lh ${tombdir}/${tombfile}
-	return 1
+	    error "tomb exists already. I'm not digging here:"
+	    ls -lh ${tombdir}/${tombfile}
+	    return 1
+    fi
+    
+    if [ -e ${tombdir}/${tombfile}.key ]; then
+        error "tomb key already exists. Quitting."
+        ls -lh ${tombdir}/${tombfile}.key
+        return 1
     fi
 
     notice "Creating a new tomb in ${tombdir}/${tombfile}"