Validation & error handling

Validation & error handling