Fixed issues when control values are missing