try to get rid of nil errors
try to get rid of nil errors