Fixed NRE on goto completion