From 6982fa2d8fa1538bb08ce2c60655de62c401d33f Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Wed, 14 Feb 2018 10:52:37 -0800
Subject: [PATCH] pvif: DBCH fix NULL check

---
 pdbApp/pvif.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pdbApp/pvif.cpp b/pdbApp/pvif.cpp
index 84ac2c6..0070cc9 100644
--- a/pdbApp/pvif.cpp
+++ b/pdbApp/pvif.cpp
@@ -37,19 +37,19 @@ namespace pvd = epics::pvData;
 
 DBCH::DBCH(dbChannel *ch) :chan(ch)
 {
+    if(!chan)
+        throw std::invalid_argument("NULL channel");
     if(dbChannelOpen(chan)) {
         dbChannelDelete(chan);
         throw std::invalid_argument("Failed to open channel");
     }
-    if(!chan)
-        throw std::invalid_argument(std::string("Invalid channel ")+dbChannelName(ch));
 }
 
 DBCH::DBCH(const std::string& name)
     :chan(dbChannelCreate(name.c_str()))
 {
     if(!chan)
-        throw std::invalid_argument("Invalid channel");
+        throw std::invalid_argument("NULL channel");
     if(dbChannelOpen(chan)) {
         dbChannelDelete(chan);
         throw std::invalid_argument("Failed to open channel "+name);