diff --git a/git_fleximod/cli.py b/git_fleximod/cli.py
index 7d09abd83b..d4498b84f9 100644
--- a/git_fleximod/cli.py
+++ b/git_fleximod/cli.py
@@ -21,7 +21,7 @@ def find_root_dir(filename=".gitmodules"):
         attempt = dl / filename
         if attempt.is_file():
             return str(dl)
-    utils.fatal_error("No .gitmodules found in directory tree")
+    return None
 
 
 def get_parser():
diff --git a/git_fleximod/git_fleximod.py b/git_fleximod/git_fleximod.py
index a003c0da8c..48a9b69f65 100755
--- a/git_fleximod/git_fleximod.py
+++ b/git_fleximod/git_fleximod.py
@@ -565,10 +565,12 @@ def main():
 
     logger.info("action is {} root_dir={} file_name={}".format(action, root_dir, file_name))
     
-    if not os.path.isfile(os.path.join(root_dir, file_name)):
-        file_path = utils.find_upwards(root_dir, file_name)
+    if not root_dir or not os.path.isfile(os.path.join(root_dir, file_name)):
+        if root_dir:
+            file_path = utils.find_upwards(root_dir, file_name)
 
-        if file_path is None:
+        if root_dir is None or file_path is None:
+            root_dir = "."
             utils.fatal_error(
                 "No {} found in {} or any of it's parents".format(file_name, root_dir)
             )
diff --git a/tests/test_d_complex.py b/tests/test_d_complex.py
index fdce516274..62889f2cba 100644
--- a/tests/test_d_complex.py
+++ b/tests/test_d_complex.py
@@ -7,7 +7,7 @@ def test_complex_checkout(git_fleximod, complex_repo, logger):
     assert("ToplevelOptional not checked out, aligned at tag v5.3.2" in status.stdout)
     assert("ToplevelRequired not checked out, aligned at tag MPIserial_2.5.0" in status.stdout)
     assert("AlwaysRequired not checked out, aligned at tag MPIserial_2.4.0" in status.stdout)
-    assert("Complex not checked out, aligned at tag testtag01" in status.stdout)
+    assert("Complex not checked out, aligned at tag testtag02" in status.stdout)
     assert("AlwaysOptional not checked out, aligned at tag MPIserial_2.3.0" in status.stdout)
     
     # This should checkout and update test_submodule and complex_sub
@@ -18,7 +18,7 @@ def test_complex_checkout(git_fleximod, complex_repo, logger):
     assert("ToplevelOptional not checked out, aligned at tag v5.3.2" in status.stdout)
     assert("ToplevelRequired at tag MPIserial_2.5.0" in status.stdout)
     assert("AlwaysRequired at tag MPIserial_2.4.0" in status.stdout)
-    assert("Complex at tag testtag01" in status.stdout)
+    assert("Complex at tag testtag02" in status.stdout)
 
     # now check the complex_sub
     root = (complex_repo / "modules" / "complex")
@@ -39,7 +39,7 @@ def test_complex_checkout(git_fleximod, complex_repo, logger):
     assert("ToplevelOptional at tag v5.3.2" in status.stdout)
     assert("ToplevelRequired at tag MPIserial_2.5.0" in status.stdout)
     assert("AlwaysRequired at tag MPIserial_2.4.0" in status.stdout)
-    assert("Complex at tag testtag01" in status.stdout)
+    assert("Complex at tag testtag02" in status.stdout)
     assert("AlwaysOptional not checked out, aligned at tag MPIserial_2.3.0" in status.stdout)
 
 
@@ -51,7 +51,7 @@ def test_complex_checkout(git_fleximod, complex_repo, logger):
     assert("ToplevelOptional at tag v5.3.2" in status.stdout)
     assert("ToplevelRequired at tag MPIserial_2.5.0" in status.stdout)
     assert("AlwaysRequired at tag MPIserial_2.4.0" in status.stdout)
-    assert("Complex at tag testtag01" in status.stdout)
+    assert("Complex at tag testtag02" in status.stdout)
     assert("AlwaysOptional at tag MPIserial_2.3.0" in status.stdout)
     
     # now check the complex_sub