Merge "Throw an exception in RoR api on no-pin case"