diff --git a/library/decort_rg.py b/library/decort_rg.py
index 750c9a7..8f1f5a8 100644
--- a/library/decort_rg.py
+++ b/library/decort_rg.py
@@ -324,11 +324,14 @@ class decort_rg(DecortController):
                                         "", # this is location code. TODO: add module argument
                                         )
 
-        self.validated_rg_id, self.rg_facts = self.rg_find(self.validated_acc_id,
-                                        self.validated_rg_id, 
-                                        arg_rg_name="",
-                                        arg_check_state=False)
-        self.rg_should_exist = True 
+        if self.validated_rg_id:
+            self.validated_rg_id, self.rg_facts = self.rg_find(
+                arg_account_id=self.validated_acc_id,
+                arg_rg_id=self.validated_rg_id,
+                arg_rg_name="",
+                arg_check_state=False
+                )
+            self.rg_should_exist = True 
         return
     
     def enable(self):
@@ -515,7 +518,7 @@ def main():
                 )
             else:
                 decon.create() 
-                if amodule.params['access']:
+                if amodule.params['access'] and not amodule.check_mode:
                     decon.access()
         elif amodule.params['state'] in ('disabled'):
             decon.error()