I have a bigger issue with the fact that Hasbro constantly packs ALL Han figures with the ANH blaster and call it a day. Case in point, the ROTJ Camo Han from the Black Series. There exists a superior and accurate sculpt for this, or very close, in the awesome ESB Han Solo that was released to TVC. Why can't they simply get this right? Short scope, silver barrel end. It's asinine I tell you.Didn't Han give a rifle to Finn? And wasn't it basically the same style rifle the Resistance troops use (without the stock some have, like Poe's at the start of the film)? Perhaps the spare pistol is another common Resistance one (in addition to the pilot pistols guys like Poe & Ello are shown with in toy form), or maybe there are others in Han's ****nal on the Falcon and she just picked another while they were flying back to D'Qar (even if she didn't carry it off the ship in the landing scene).
As for Han's, clearly he never got it back from Vader, as he was in carbonite for several months. The blaster in ROTJ isn't the same as the one in ESB; it's the same/similar prop to one of the models used in ESB (the Stunt or Hero one, I forget which, with the scope raised up higher on the body of the gun than the other version), but Han just got himself another...just as Luke had one of his own in ESB (which was slightly different from Han's, too, in both Hero & Stunt models).
The bigger issue I have with Han's blasters is when people assume it's the same blaster thru all 4 films. Same model number, yes... but he modifies 'em quite often. TFA's blaster is the first one since ANH to have a long scope again, but probably isn't meant to be the same individual blaster he used in any of the OT films with a new scope. He just favors DL-44s (which makes sense, as all his holsters are designed for them!)