0.3 - Fix Null string handling