Feature/boom errors

doesn't really matter, it resolves to the same assertion.