Safety checks

Making sure no null vars are accessed