Bug fixes to Simulator Class

Fixed some null pointers in the simulator class