Actually Really For Really Real Fixed NPE This Time :)