diff --git a/src/ca/client/perl/Makefile b/src/ca/client/perl/Makefile
index dc58f771c..b3fe549c7 100644
--- a/src/ca/client/perl/Makefile
+++ b/src/ca/client/perl/Makefile
@@ -13,7 +13,7 @@ include $(TOP)/configure/CONFIG
 # to generate header file dependancies for Darwin.
 # Darwin has multiple -arch compiler flags.
 ifeq ($(OS_CLASS),Darwin)
-HDEPENDS_METHOD = CMD
+HDEPENDS_METHOD = MKMF
 endif
 
 ifneq ($(findstring darwin,$(T_A)),)
diff --git a/src/libCom/osi/os/posix/osdMutex.c b/src/libCom/osi/os/posix/osdMutex.c
index 44a3c4d6e..68235ab3f 100644
--- a/src/libCom/osi/os/posix/osdMutex.c
+++ b/src/libCom/osi/os/posix/osdMutex.c
@@ -28,8 +28,16 @@
 #include "epicsAssert.h"
 
 #define checkStatus(status,message) \
-if((status)) { \
-    errlogPrintf("epicsMutex %s failed: error %s\n",(message),strerror((status)));}
+    if((status)) { \
+        errlogPrintf("epicsMutex %s failed: error %s\n", \
+            (message), strerror((status))); \
+    }
+#define checkStatusQuit(status,message,method) \
+    if(status) { \
+        errlogPrintf("epicsMutex %s failed: error %s\n", \
+            (message), strerror((status))); \
+        cantProceed((method)); \
+    }
 
 static int mutexLock(pthread_mutex_t *id)
 {