Errors, Errors EVERYWHERE

Change-Id: I3b877f9d97c7e48433eb80e196af4306422b89e1