[#145] Fixing rookie mistake of not checking for user (doh!).