feat: improve error handling & logging