Adressed null issues

Should fix excessive log files.