Merge pull request #32 from davidmsantos90/master

[CDE-198]: handles NullPointerException when trying to resolve role for ...