Merge pull request #814 from TheBlueMatt/2021-03-optional-handlers