Better error handling
Fixes bug where when params does not define a scope