UPC-35 Some minor improvements (better error reporting)