Missing server error handling & UI tweaks