Fixed problem when no query string was present
Merge branch 'hotfix/1.5.4'

* hotfix/1.5.4:
  Fixed problem when no query string was present