Previously the exception raised for Gen7 servers were not handled properly. This commit resolves the issue by handling the exception in a appropriate manner. Change-Id: I7371fb26e78a558ee382bbe9785e6401c51437bd Closes-Bug: #1613831