Add null user check and db reload tool