replaced RuntimeExceptions in two cases with newly introduced HandlerExceptions