Fix 500 on panorama building save (for real this time) (#622)

Fix 500 on panorama building save (for real this time) (#622) #297