Fix some exception/errors