fixed a bug in Edge and Property messaging due to Optional<> wrapping.