Error throws fixed
Merge pull request #5 from mucsi96/error-throw-fixes

Error throw fixes