Check the coolant level and make sure it is full. There may be a air bubble causing the heater problem but there may be head gasket problem and exhaust gases are getting into the coolant and causing the trouble. Have a block check done to see if that is happening.