diff --git a/src/as/asDbLib.c b/src/as/asDbLib.c
index a04d220f5..dc23ef2b8 100644
--- a/src/as/asDbLib.c
+++ b/src/as/asDbLib.c
@@ -148,13 +148,16 @@ static long asInitCommon(void)
     long	status;
     char	buffer[BUF_SIZE];
 
-    if(!pacf) return(0);
     if(asLockInit) {
 	FASTLOCKINIT(&asLock);
 	asLockInit = FALSE;
     }
     FASTLOCK(&asLock);
     if(asActive)asCaStop();
+    if(!pacf) {
+	asActive = FALSE;
+	return(0);
+    }
     buffer[0] = 0;
     my_buffer = buffer;
     my_buffer_ptr = my_buffer;
diff --git a/src/as/asLib_lex.l b/src/as/asLib_lex.l
index eb716c4d3..43f1d23bd 100644
--- a/src/as/asLib_lex.l
+++ b/src/as/asLib_lex.l
@@ -1,6 +1,6 @@
 integer	[0-9]
 name	[a-zA-Z0-9_\.]
-pvname  [a-zA-Z0-9_:\.\[\]<>;]
+pvname  [a-zA-Z0-9_\-:\.\[\]<>;]
 string   [a-zA-Z0-9_\,\./\*#\[\]%: ;!|\'\-&\(\)@\?\+<>=\$]
 
 %{