bugfix: Null pointer exception (BugSense Error #94595166)