Merge "Fix potential errors in ASDCController"