Extra check to avoid warnings in log