Fix parameter validation for gs
Merge pull request #1858 from zwilt/develop

Fix parameter validation for gs