Fix issue where the entire plugin failed

Bug from 369d99cacd06e61a3e34f719820a9d27badcb2a4