TODO additions
Don't fail cfrunpy on Matplotlib errors