Fixed some issues introduced in last changesets

This patch should increase findbugs report and solve some issues that
will occure:

* Doing operation on NULL object
* Using wrong object type in hope of magic object casting ;-)