fixed null object/null value errors on dash