Removed code that produces errors, fixed ExtId issue
Fixed null pointer exception when entering new State