Provide more feedback in console, fix an IllegalArgumentException