diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 0d16e1ea6d..ef3d164865 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -1034,17 +1034,17 @@ void Plater::priv::init()
                 user_account->on_communication_fail();
             }
         });
-        this->q->Bind(EVT_UA_AVATAR_SUCCESS, [this](UserAccountSuccessEvent& evt) {
-           boost::filesystem::path path = user_account->get_avatar_path(true);
-           FILE* file; 
-           file = boost::nowide::fopen(path.generic_string().c_str(), "wb");
-           if (file == NULL) {
-               BOOST_LOG_TRIVIAL(error) << "Failed to create file to store avatar picture at: " << path;
-               return;
-           }
-           fwrite(evt.data.c_str(), 1, evt.data.size(), file);
-           fclose(file);
-           this->main_frame->refresh_account_menu(true);
+        this->q->Bind(EVT_UA_AVATAR_SUCCESS, [this](UserAccountSuccessEvent& evt) {   
+            boost::filesystem::path path = user_account->get_avatar_path(true);
+            FILE* file; 
+            file = boost::nowide::fopen(path.generic_string().c_str(), "wb");
+            if (file == NULL) {
+                BOOST_LOG_TRIVIAL(error) << "Failed to create file to store avatar picture at: " << path;
+                return;
+            }
+            fwrite(evt.data.c_str(), 1, evt.data.size(), file);
+            fclose(file);
+            this->main_frame->refresh_account_menu(true);
         }); 
         this->q->Bind(EVT_UA_PRUSACONNECT_PRINTER_DATA_SUCCESS, [this](UserAccountSuccessEvent& evt) {
             this->user_account->set_current_printer_data(evt.data);
diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp
index 602bf4c601..cdc62fe67a 100644
--- a/src/slic3r/GUI/wxExtensions.cpp
+++ b/src/slic3r/GUI/wxExtensions.cpp
@@ -487,8 +487,11 @@ ScalableBitmap::ScalableBitmap(wxWindow* parent, boost::filesystem::path& icon_p
     const std::string ext = icon_path.extension().string();
 
     if (ext == ".png" || ext == ".jpg") {
-        bitmap.LoadFile(path, ext == ".png" ? wxBITMAP_TYPE_PNG : wxBITMAP_TYPE_JPEG);
-
+        if (!bitmap.LoadFile(path, ext == ".png" ? wxBITMAP_TYPE_PNG : wxBITMAP_TYPE_JPEG)) {
+            BOOST_LOG_TRIVIAL(error) << "Failed to load bitmap " << path;
+            return;
+        }
+        
         // check if the bitmap has a square shape
 
         if (wxSize sz = bitmap.GetSize(); sz.x != sz.y) {