Improved logic with testing if a reset component is valid