diff --git a/common/build_version.cpp b/common/build_version.cpp
index 836216aa9a..7d52bc533c 100644
--- a/common/build_version.cpp
+++ b/common/build_version.cpp
@@ -9,9 +9,12 @@
 #define KICAD_BUILD_VERSION "(2011-03-17)"
 #endif
 
+// uncomment this line only when creating a stable version
 //#define VERSION_STABILITY      "stable"
-#define VERSION_STABILITY       "testing"
 
+#ifndef VERSION_STABILITY
+#define VERSION_STABILITY       "testing"
+#endif
 
 /**
  * Function GetBuildVersion
diff --git a/cvpcb/savecmp.cpp b/cvpcb/savecmp.cpp
index 98f0a2524d..279ca1136d 100644
--- a/cvpcb/savecmp.cpp
+++ b/cvpcb/savecmp.cpp
@@ -82,8 +82,9 @@ bool CVPCB_MAINFRAME::LoadComponentFile( const wxString& fileName )
     source = wxFopen( fn.GetFullPath(), wxT( "rt" ) );
     if( source == NULL )
     {
-        msg.Printf( _( "Cannot open component library <%s>." ),
+        msg.Printf( _( "Cannot open CvPcb component file <%s>." ),
                     GetChars( fn.GetFullPath() ) );
+        msg << wxT("\n") << _("This is normal if you are opening a new netlist file");
         wxMessageBox( msg, titleComponentLibErr, wxOK | wxICON_ERROR );
         return false;
     }