Added tweaks so code fails gracefully if we have no home page image