Partial fix for #504 - No error checking in the User helper