Fix NPE

Everything else is perfect