Ensure 304 status code does not throw, but returns None instead

Ensure 304 status code does not throw, but returns None instead #627