close #32 - added clause to prevent null