Add more tooling to check for error