InvalidParameterValue Exception was not properly raised which resulted in Error 500. Change-Id: I760f4596b8a06ad6eb7eaf7bdf332184e856c22a Closes-Bug: #1638539