added warning and critical messages
fix