add 'not found' support