minor change for error handling