Restructure error checks to favor flatter code structure rather than nesting

[jeff-cohere]

@ialarmedalien pointed out that the way I've been doing error checking produces nested code structure, and that a flatter structure might be more readable. Let's flatten this error checking.