LPS-47464 validate before checking

@topolik can you confirm this solves the issue for you? it does for me.