Refactored throw_at
v2.0
Merge pull request #2170 from Rockdtben/throwAtRefactor

Refactored throw_at