minhnguyen - fix exception