Fix scope error handling and property rebroadcast