diff --git a/modules/conop/src/compound_lib_base.cc b/modules/conop/src/compound_lib_base.cc
index b5071e00fdc48f62f4cd8475b9589f5c67e8de19..708c630bbc107af4032711ebb9b84204fb2f668a 100644
--- a/modules/conop/src/compound_lib_base.cc
+++ b/modules/conop/src/compound_lib_base.cc
@@ -16,8 +16,10 @@ bool CompoundLibBase::IsResidueComplete(const ost::mol::ResidueHandle& res, bool
         }
       }
     }
-    if(!res.FindAtom(it->name).IsValid()){
-      return false;
+    else{
+      if(!res.FindAtom(it->name).IsValid()){
+        return false;
+      }
     }
   }
   return true;