Make our management command more robust