Fix the validation flow in the WSServer
Merge pull request #163 from Paulloz/wsserverflow

Fix the validation flow in the WSServer