Add Label command
Improve exception handling