Fixing behavior for status check to add compiler awareness

Change-Id: I92262be70bf224f4972805923c6745eb404bc67c