Make the query a little bit more bullet proof.