2 files changed, 4 insertions, 2 deletions

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 6cc4a0812..26a580cb7 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -169,6 +169,9 @@ struct System::Impl {
 
         interrupt_manager = std::make_unique<Core::Hardware::InterruptManager>(system);
         gpu_core = VideoCore::CreateGPU(emu_window, system);
+        if (!gpu_core) {
+            return ResultStatus::ErrorVideoCore;
+        }
         gpu_core->Renderer().Rasterizer().SetupDirtyFlags();
 
         is_powered_on = true;
@@ -181,7 +184,6 @@ struct System::Impl {
 
     ResultStatus Load(System& system, Frontend::EmuWindow& emu_window,
                       const std::string& filepath) {
-
         app_loader = Loader::GetLoader(GetGameFileFromPath(virtual_filesystem, filepath));
         if (!app_loader) {
             LOG_CRITICAL(Core, "Failed to obtain loader for {}!", filepath);
diff --git a/src/core/frontend/emu_window.h b/src/core/frontend/emu_window.h
index bb283d844..72294d4d8 100644
--- a/src/core/frontend/emu_window.h
+++ b/src/core/frontend/emu_window.h
@@ -30,7 +30,7 @@ public:
 
     class Scoped {
     public:
-        Scoped(GraphicsContext& context_) : context(context_) {
+        explicit Scoped(GraphicsContext& context_) : context(context_) {
             context.MakeCurrent();
         }
         ~Scoped() {