Fix initial validation and return errors for better debug