BF: Resolve error handling logic.