removed null exceptions thrown