Fixed issues with switch from stop to warn.