Fix issue MR-410 - Unhandled exception when clicking New button under Theme