Fail on registering queries
Use the right exception type
Remove unix slash
Merge branch 'develop'