fixed null date check
Merge branch 'master' of github.com:umayr/badass