Made some error checks in the Admin class