BUG: 15010: Check if argument is valid when fetching data from query results
Merge pull request #6 from GArik/fix-15010

BUG: 15010: Check if argument is valid when fetching data from query results