Added exception handling for 404, 104, etc...