ws_assassins bugfix

improved initial checks