Minor fix to Makefile
Update to work with 9.3

need more testing
Add check for NULL input and regression test