Added handling of some situation occurences