completed support for case-else handler