Better error handling when role does not exist

Adds error handling when role does not exist