Added checks for launching launcher directly