Adding / fixing 404 handler in sample code
Updating sample code