always raise an error if we will be returning error

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>