diff --git a/lib/Makefile b/lib/Makefile
index 23f89400..561d4b6b 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -28,8 +28,8 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 # Production mode flags
-CFLAGS = -O3 -Wall
-LDFLAGS = 
+#CFLAGS = -O3 -Wall
+#LDFLAGS = 
 
 # Debug mode flags
 CFLAGS = -g -DDEBUG -Wall
diff --git a/lib/ckpt.c b/lib/ckpt.c
index 05341bcf..7b973a29 100644
--- a/lib/ckpt.c
+++ b/lib/ckpt.c
@@ -814,6 +814,9 @@ saCkptCheckpointStatusGet (
 	struct req_lib_ckpt_checkpointstatusget req_lib_ckpt_checkpointstatusget;
 	struct res_lib_ckpt_checkpointstatusget res_lib_ckpt_checkpointstatusget;
 
+	if (checkpointStatus == NULL) {
+		return (SA_AIS_ERR_INVALID_PARAM);
+	}
 	error = saHandleInstanceGet (&checkpointHandleDatabase, checkpointHandle,
 		(void *)&ckptCheckpointInstance);
 	if (error != SA_AIS_OK) {