PWA-7 added reimport on exception