Fix #1122 - Add check for NULL RFlag