Assorted bug fixes

:fork_and_knife: 

These two commits address some Sentry errors that have come in over the past few days.  The commit messages are pretty self-explanatory.