Tidied up response handling for 404
Introduced constants