#115

Take care of null and undefined values