Merge branch 'ionic-pci-error-handling-fixes'