MAGMA-251 Make sure tokens are not null in the sql query
Merge branch 'master' of https://github.com/obiba/magma