#12 - Adding some null checks

These things can now be null, check and ignore if they are.