[Frontend-STFL] Third time is the charm, checks for null now