more logging and error handling