Revert some debug code
Fix NPE in MDServer
Try again if Zip file not found.