Fix for the following bugs:
#18 NPE while building the site
#19 Zip Exception while building site