@@ -399,6 +399,7 @@ void TopLevelWindowModel::onSurfaceCreated(unityapi::MirSurfaceInterface */*surf
399399void TopLevelWindowModel::onSurfacesAddedToWorkspace(const std::shared_ptr<miral::Workspace>& workspace,
400400 const QVector<unity::shell::application::MirSurfaceInterface*> surfaces)
401401{
402+ if (!m_workspace || !m_applicationManager) return;
402403 if (workspace != m_workspace->workspace()) return;
403404
404405 Q_FOREACH(auto surface, surfaces) {
@@ -829,6 +830,7 @@ void TopLevelWindowModel::refreshWindows()
829830 m_windowModel.clear();
830831 m_allSurfaces.clear();
831832
833+ if (!m_workspace || !m_applicationManager) return;
832834 WindowManagementPolicy::instance()->forEachWindowInWorkspace(m_workspace->workspace(), [this](const miral::Window &window) {
833835 auto surface = m_surfaceManager->surfaceFor(window);
834836 if (surface) {