No use defining the IDs if I don't use them!
Fixed a NPE

And added a new one o.0