Make User more robust (never nil)

[rwxrob]

Current implementation does not account for possible errors that could leave User as a nil pointer. Need to ensure this is never the case.