Improve logging and error handling during relocation