Removed error message in unnecessary places