Checks for query before trying to display one.

Bumps version to 2.0.3.
Merge branch 'hotfix/2.0.3'