adds check on if there was something found and sets messages now too