Improved status check