fixes
crash safeguard
warning fix