Merge "ExceptionInInitializerError should wrap only non Error exceptions."