Remove duplicative Error classes

Due to a poorly resolved merge conflict by yours truly.

Change-Id: I3fa7e50e63422813672bda66a526a9481727e606