More error fixes

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