fix: raise exception on export interrupt
fix: custom layers support