#173 added checks for null and blank values
Merge pull request #202 from krzyk/173

#173 added checks for null and blank values