RPV-265 Fix for error on saving patient