Added condition for creating container in case one exists.