1 files changed, 12 insertions, 4 deletions
diff --git a/crawl-ref/source/goditem.cc b/crawl-ref/source/goditem.cc
index f5c6e8976b..3a1341accb 100644
--- a/crawl-ref/source/goditem.cc
+++ b/crawl-ref/source/goditem.cc
@@ -429,15 +429,23 @@ bool god_hates_rod(const item_def& item)
 
 conduct_type good_god_hates_item_handling(const item_def &item)
 {
-    if (!is_good_god(you.religion) || !is_evil_item(item))
+    if (!is_good_god(you.religion)
+        || (!is_unholy_item(item) && !is_evil_item(item)))
+    {
         return (DID_NOTHING);
+    }
+
+    if (item_type_known(item))
+    {
+        if (is_evil_item(item))
+            return (DID_NECROMANCY);
+        else
+            return (DID_UNHOLY);
+    }
 
     if (is_demonic(item))
         return (DID_UNHOLY);
 
-    if (item_type_known(item))
-        return (DID_NECROMANCY);
-
     return (DID_NOTHING);
 }