Added @Null annotation