Guide: improve error handling