Add null check
Merge branch 'master' of github.com:searbe/brite-sql