Fix notfound and none issues