main: Do not dump if handle is Null object.
makefile: Fix bug
project: Some tweaks.