Fixes issue 97

Fixes issue #97 by checking for Null string