Update empty.json to new format and add some error handling to expand.py