Cleanup false errors/warnings

Modify a couple of commands so they do not report
falsely that they have failed.

Change-Id: I9b28725cef67dd7c445195014d224a2efeb2585c
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>