Copies code from saveInstance to saveInstanceExtra (#215)

This should be replicate the same property validation behaviour.