Return and use null instead of -1 for error value.

Return and use null instead of -1 for error value. #12