diff --git a/src/view/edit-point-view.js b/src/view/edit-point-view.js
index 9f17184..d70feb0 100644
--- a/src/view/edit-point-view.js
+++ b/src/view/edit-point-view.js
@@ -96,7 +96,7 @@ export const editingPointView = (point, destinations, offersIds, isNewPoint) =>
                       ${type}
                     </label>
                     <input class="event__input  event__input--destination" id="event-destination-${destination}"
-                    type="text" name="event-destination" value="${he.encode(destinationData.name)}"
+                    type="text" name="event-destination" value="${destinationData ? he.encode(destinationData.name) : ''}"
                     list="destination-list-1" ${isDisabled ? 'disabled' : ''}>
                     <datalist id="destination-list-1" ${isDisabled ? 'disabled' : ''}>
                      ${generateDestinations(destinations, isDisabled)}
@@ -138,7 +138,7 @@ export const editingPointView = (point, destinations, offersIds, isNewPoint) =>
                     </div>
                   </section>
 
-                  <section class="event__section  event__section--destination">
+                  ${destinationData ? `<section class="event__section  event__section--destination">
                     <h3 class="event__section-title  event__section-title--destination">Destination</h3>
                     <p class="event__destination-description">${destinationData.description}</p>
                      <div class="event__photos-container">
@@ -146,7 +146,7 @@ export const editingPointView = (point, destinations, offersIds, isNewPoint) =>
                      ${createPhotosTemplates(destinationData.pictures)}
                     </div>
                     </div>
-                  </section>
+                    </section>` : ''}
                 </section>
               </form>
   </li>`
diff --git a/src/view/point-view.js b/src/view/point-view.js
index e058b30..4703809 100644
--- a/src/view/point-view.js
+++ b/src/view/point-view.js
@@ -13,9 +13,9 @@ const createOffersTemplates = (allOffers, checkedOffers) => {
 
 export const pointView = (point, destinations, offersIds) => {
   const {type, destination, startDate, endDate, price, isFavorite, offers} = point;
-  const dateFrom = startDate !== null ? humanizePointDate(startDate, 'DD/MM/YY HH:mm') : '';
-  const dateTo = endDate !== null ? humanizePointDate(endDate, 'DD/MM/YY HH:mm') : '';
-  const date = startDate !== null ? humanizePointDate(startDate, 'D MMMM') : '';
+  const dateFrom = startDate !== null ? humanizePointDate(startDate, 'HH:mm') : '';
+  const dateTo = endDate !== null ? humanizePointDate(endDate, 'HH:mm') : '';
+  const date = startDate !== null ? humanizePointDate(startDate, 'MMM D') : '';
   const allTypeOffers = offersIds.find((offer) => offer.type === type);
   const favoriteClass = isFavorite ? 'event__favorite-btn--active' : '';
   const destinationData = destinations.find((dest) => dest.id === destination);