Merge "Add theme information during throwing exception"