Minor cleanups to theme-package error handling.