Started working ticket #39, no exceptions anymore but some other issues remaining
Authored by: eziomacmanus 2016-07-26
Parent: [r112]
Child: [r114]
