Add missing stamp + improve error handling