Source: Attempt at better error reporting