fix: avoid returning nulls to prevent later NPE

fix: avoid returning nulls to prevent later NPE #133