Attempt to mitigate #409. Add logging for when it does happen