Merge "Catch SSE when no subId is loaded"