Updated error handling V0.0.3