Fixed exceptions being thrown during build