Remove stupid if conditions
Merge pull request #183 from thescouser89/fix_nulls

Remove stupid if conditions