Handle error from upload definition command

Partially closes bug: #1322421

Change-Id: I67a525856fa2b80a7f9624b448352b0438141a98
Merge "Handle error from upload definition command"