added not found -handling to other things