Server-side validation & 'else' fix