2014.08: added null checks and bugfix 5175