First cut at fixing 1295 - just move stuff out of the if clause
First cut at fixing 1295 - just move stuff out of the if clause

tcmitchell/geni-portal,tcmitchell/geni-portal,tcmitchell/geni-portal,tcmitchell/geni-portal,charliemeyer/geni-portal,charliemeyer/geni-portal,tcmitchell/geni-portal,charliemeyer/geni-portal,charliemeyer/geni-portal,charliemeyer/geni-portal