Throw proper errors, remove underscore dep