revert "invokeOnEdt — always check passed condition"
fix NPE