Return errors immediately so the straightline path is the normal,
no-error path.  No functional change.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>