[rubbos] (change:minor) Added safety checks for null values.
[rubbos] (bug-fix:minor) Added initial and final markers in regex