Add validation of Stage
Improve validation and error reporting