Fixed guild issue where upgrade button was available before building was built.
Added safeguards to new save game variables.