Improve error handling & release v0.3.3