Clean up
Fail on registering queries
Use the right exception type
Merge branch 'develop' into feature/recommendationTest
Remove unix slash
Merge branch 'develop' into feature/recommendationTest