Better constructor validation
Improve constructor validation