Removed un-need checks possible fixing a null point error.