fix error handling.
Merge branch 'fix-makefile'