Fix an error setting image ID
Added some null checks that cause NPEs
Merge branch '2014.03' into develop