fix for null command line and comment