Fix App dispathcer
Added 404 + safer method