Made changes to remove undefined notice message