Be more defensive about the received data
version 2.1.11