fixes for null string