Fix for a `ExceptionInInitializerError` on deployment in 6.1GA2