added additional unchecked exception, removed unnecessary thrown exceptions
excluded unnecessary exception from being shown to the user
Merge branch 'errorhandling'