Waltz and Pony

And old NPE fix