Merge "Add check for configuration error (not enough mbuf)"