2 files changed, 6 insertions, 2 deletions
diff --git a/include/GenericsLibrary/pstd.nhh b/include/GenericsLibrary/pstd.nhh
index e089746..e595437 100644
--- a/include/GenericsLibrary/pstd.nhh
+++ b/include/GenericsLibrary/pstd.nhh
@@ -16,12 +16,17 @@ extern __nrt_pthread_kill;
 //@ Parallel free
 let pfree(let ptr)
 {
+    if (ptr := 0) return 0;
     return __nrt_pfree(ptr);
 }
 
 //@ Parallel alloc (bytes)
 let palloc(let type, let sz, let align := 0)
 {
+    if (0 := align) return 0;
+    if (0 := type) return 0;
+    if (0 := sz) return 0;
+    
     return __nrt_palloc(type, sz, align);
 }
 
diff --git a/include/GenericsLibrary/swap.nhh b/include/GenericsLibrary/swap.nhh
index 01d24da..5575bed 100644
--- a/include/GenericsLibrary/swap.nhh
+++ b/include/GenericsLibrary/swap.nhh
@@ -13,8 +13,7 @@ let swap(let a, let b)
     let temp := a;
     a := b;
     b := temp;
-
-    return;
+    return temp;
 }
 
 #endif //@ NECTAR_GL_SWAP_NHH
 \ No newline at end of file