Feature/boom errors

- [ ] Ensure this is tested too