improve error handling
version 0.0.5