Fixing the throwing of 404