Fix uncaught exceptions in validator
Fix gaps and errors in validators