The module has been broken for a week for me. This change aims to make the code a bit more resilient.