removed pointless exception handling