There was no reason for that to be final
Removed null problem