diff --git a/core/src/gui/menus/source.cpp b/core/src/gui/menus/source.cpp
index 46dd9685..1afe0e07 100644
--- a/core/src/gui/menus/source.cpp
+++ b/core/src/gui/menus/source.cpp
@@ -76,6 +76,7 @@ namespace sourecmenu {
         auto it = std::find(sourceNames.begin(), sourceNames.end(), name);
         if (it == sourceNames.end()) {
             selectSource(sourceNames[0]);
+            return;
         }
         sourceId = std::distance(sourceNames.begin(), it);
         selectedSource = sourceNames[sourceId];
diff --git a/core/src/version.h b/core/src/version.h
index 9d1afaf6..7a2ed301 100644
--- a/core/src/version.h
+++ b/core/src/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_STR "0.3.0_beta"
\ No newline at end of file
+#define VERSION_STR "1.0.0_rc1"
\ No newline at end of file
diff --git a/sdrplay_source/src/main.cpp b/sdrplay_source/src/main.cpp
index c028dc68..29c32e31 100644
--- a/sdrplay_source/src/main.cpp
+++ b/sdrplay_source/src/main.cpp
@@ -116,7 +116,11 @@ public:
         cbFuncs.StreamACbFn = streamCB;
         cbFuncs.StreamBCbFn = streamCB;
 
-        sdrplay_api_Open();
+        sdrplay_api_ErrT err = sdrplay_api_Open();
+        if (err != sdrplay_api_Success) {
+            spdlog::error("Could not intiatialized the SDRplay API. Make sure that the service is running.");
+            return;
+        }
 
         sampleRate = 2000000.0;
         srId = 0;