QAART-433 Fixes from CR: Adding logging for default case