wip better error catching
Actually put the fucking command name in there