Bugfix

Bugfix addressing crashing condition. Cause is still unknown.