#501 - Refactoring SafePaint to use a static getter to ensure initialization