Positive ID
Fixed nullpointer