Fixed an issue where messages were printed when they shouldn't have been.