Changed exception handling in Theme