Bug fix for server crash during folder download

* Downloading a folder does not crash server
* Changed folder download event to be the same
  as file download