bug-fixes: addressing adjudication bugs

- fix mantis issue 0000599
- enforce consistent use of is_null, use current()
- style fixes where required