fix: handle properly null and undefined props values

fix: handle properly null and undefined props values #186