FIX Nice errors and allows flush on module removal