f7161a9afb
* Return different status codes depending on result, not just BAD_REQUEST, fixes #1247 * Reduce number of unwraps * Refactoring