FIX Nice errors and allows flush on module removal
Merge pull request #2262 from hafriedlander/fix/flush_24

FIX Nice errors and allows flush on module removal