Fixed NPE on unresolvable sources
Fixed ZipException