More error fixes

Change-Id: I60fb8e100f57142837b7cfbff222e6c02dd7e30a
Signed-off-by: Evan Anderson <evan1124@gmail.com>