Fix error code candling, allow ALL options