Added more robust check for user-added data.