Fixed NPE caused by Statement#getReturnType returning Null

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/BlockStatement.java

@@ -7,6 +7,7 @@ package org.openzen.zenscript.codemodel.statement;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -96,6 +97,7 @@ public class BlockStatement extends Statement {
 	public StoredType getReturnType() {
 		final List<StoredType> collect = Arrays.stream(statements)
 				.map(Statement::getReturnType)
+				.filter(Objects::nonNull)
 				.distinct()
 				.collect(Collectors.toList());
 		if(collect.isEmpty())

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/ReturnStatement.java

@@ -11,6 +11,7 @@ import org.openzen.zencode.shared.ConcatMap;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
 
 /**
@@ -28,7 +29,7 @@ public class ReturnStatement extends Statement {
 	
 	@Override
 	public StoredType getReturnType() {
-		return value.type;
+		return value != null ? value.type : BasicTypeID.VOID.stored();
 	}
 	
 	@Override