Added more logging messages and updated get error message macro name