Fixed null errors in arena