Tent saving fix 2017

Fix for 2017 not saving tents and popping errors when cleaning up objects.