Fixed error converting DbNull to string. Added additional null filter.