Bump version to 2.4.1-SNAPSHOT
minor refactor (improve null handling case)