added exception, namespace bug fix.