Fix pre-flight error reporting

Resolve #40