add return identifier information
fix null pointer exceptions for certain return situations