The method for getting the declaring class name was not used when printing the class name, and was incorrect anyway. Use reflection when on the error path to ensure the correct class name is used. Change-Id: Ic9cd4319535d5ab877a0563e0433371e1025d985
Change-Id: I83e6ee4e8eedd49acef2b5d92132d37af715bff3