Minor handling adjustments
Authored by: Johannes Binder 2014-05-31
Parent(s): [3b976a]
Child(ren): [d18cbf]