RPV-251 Fix for null sourceType