fixes merge
celery command: Better error handling