404 and better controller handling