Improve comment, error handling