*** handler_emwin.cc    Thu Jun 21 19:44:41 2018
--- handler_emwin.cc    Thu Jun 21 19:44:36 2018
***************
*** 36,49 ****
    fb.time = time;

    // Decompress if this is a ZIP file
    if (nlh.noaaSpecificCompression == 10) {
!     auto zip = Zip(f->getData());
!     fb.filename = zip.fileName();

!     // Use filename and extension straight from ZIP file
!     fileWriter_->write(fb.build("{filename}"), zip.read());
!     return;
    }

    // Write with TXT extension if this is not a compressed file
    if (nlh.noaaSpecificCompression == 0) {
--- 36,55 ----
    fb.time = time;

    // Decompress if this is a ZIP file
    if (nlh.noaaSpecificCompression == 10) {
!     try {
!       auto zip = Zip(f->getData());

!       fb.filename = zip.fileName();
!
!       // Use filename and extension straight from ZIP file
!       fileWriter_->write(fb.build("{filename}"), zip.read());
!       return;
!     } catch(const std::exception &e)  {
!       // Zip decompression failed
!       return;
!     }
    }

    // Write with TXT extension if this is not a compressed file
    if (nlh.noaaSpecificCompression == 0) {