We're searching for a surface in the surfaces list when switching but it could be it is no longer present at that time. Make sure we're removing it when the desktop surface is being destroy not only when it was previously activated.