Ensure save handler gracefully handles undefined layout data

Ensure save handler gracefully handles undefined layout data #78