[FEATURE] - add Mock Server error handling

Change-Id: I8353346e18385ed58c616808ac1c1b5dcc992be0
Merge "[FEATURE] - add Mock Server error handling"