Fixed issue in commandline handling
Added domains to handle errors