diff --git a/src/addons/news_manager.cpp b/src/addons/news_manager.cpp
index 12baaa94c..251a5d0e9 100644
--- a/src/addons/news_manager.cpp
+++ b/src/addons/news_manager.cpp
@@ -204,7 +204,8 @@ void* NewsManager::downloadNews(void *obj)
         xml = new XMLNode(xml_file);
         me->checkRedirect(xml);
         me->updateNews(xml, xml_file);
-        addons_manager->init(xml, me->m_force_refresh);
+        if (addons_manager)
+            addons_manager->init(xml, me->m_force_refresh);
         delete xml;
     }
 
diff --git a/src/states_screens/main_menu_screen.cpp b/src/states_screens/main_menu_screen.cpp
index 2640633ae..f6f0fb8f9 100644
--- a/src/states_screens/main_menu_screen.cpp
+++ b/src/states_screens/main_menu_screen.cpp
@@ -145,7 +145,7 @@ void MainMenuScreen::init()
     input_manager->getDeviceManager()->clearLatestUsedDevice();
 
 #ifndef SERVER_ONLY
-    if (addons_manager->isLoading())
+    if (addons_manager && addons_manager->isLoading())
     {
         IconButtonWidget* w = getWidget<IconButtonWidget>("addons");
         w->setActive(false);