Better error handling of missing parameters
Merge branch 'dev'