Also makes error handling and variable capitalization consistent with other functions.
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>