diff --git a/cime_config/buildlib b/cime_config/buildlib
index 39e190eba5..73db5db3dd 100755
--- a/cime_config/buildlib
+++ b/cime_config/buildlib
@@ -60,7 +60,7 @@ def _build_cam(caseroot, libroot, bldroot):
             compiler = case.get_value("COMPILER")
             mpilib = case.get_value("MPILIB")
             debug = "debug" if case.get_value("DEBUG") else "nodebug"
-            threaded = "threads" if case.get_value("BUILD_THREADED") else "nothreads"
+            threaded = "threads" if case.get_value("BUILD_THREADED") or case.get_value("FORCE_BUILD_SMP") else "nothreads"
             comp_interface = case.get_value("COMP_INTERFACE")
             fmsbuilddir = os.path.join(
                 slr, compiler, mpilib, debug, threaded, comp_interface)
@@ -91,8 +91,7 @@ def _build_cam(caseroot, libroot, bldroot):
         # -------------------------------------------------------
         if cam_dycore == "fv3":
             libfms = os.path.join(fmsbuilddir, "libfms.a")
-            expect(os.path.isfile(libfms),
-               "err: Missing the FMS library libfms.a - cannot complete CAM build")
+            expect(os.path.isfile(libfms), "FMS library not found {}".format(libfms))
             shutil.copy(libfms, libroot)
 
         # -------------------------------------------------------