closes #69
closes #70
closes #71
Merge branch 'hotfix/dont_show_null_warnings'