minor tweak/improvement to server side error handling