Commit e3f9bf3378c45148c35c62a814d9817c8ca2e953

Philipp Wiesemann 2015-02-08T22:50:16

Fixed two inconsistencies on failed allocation.