Fix up -Whatif and exceptions
add missing file